Download the Android SDK as a CIPD package

scripts/slave/recipe_modules/skia/android_flavor.py

Index: scripts/slave/recipe_modules/skia/android_flavor.py
diff --git a/scripts/slave/recipe_modules/skia/android_flavor.py b/scripts/slave/recipe_modules/skia/android_flavor.py
index 3050acf0a5eca22797c1936dbab95fd82f1f6cc9..3a876bde7bb7952068bff4e1a82561be2e3cb326 100644
--- a/scripts/slave/recipe_modules/skia/android_flavor.py
+++ b/scripts/slave/recipe_modules/skia/android_flavor.py
@@ -68,7 +68,8 @@ class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
         android_devices.SLAVE_INFO['default'])
     self.android_bin = self._skia_api.skia_dir.join(
         'platform_tools', 'android', 'bin')
-    self._android_sdk_root = self._skia_api.slave_dir.join('android-sdk')
+    self._android_sdk_root = self._skia_api.slave_dir.join(
+        'android_sdk', 'android-sdk')

[rmistry, 2016/06/30 11:27:41]

Two directories with different separators is... strange..

[borenet, 2016/06/30 11:33:39]

Yeah...

1. The CIPD package containing the Android SDK has the android-sdk directory at
the root level.  This is for cleanliness/sanity in case the package is unzipped
inside a directory containing other things.  "android-sdk" is named like the
"android-sdk-linux" and "android-sdk-macosx" directories you get when you
install the SDK on your machine.

2. We unzip the CIPD packages into named directories in case they don't follow
the rule in #1.  I named the CIPD package android_sdk.

I could change one of the two names, but the two-level directories are
protecting us from potential issues.

     self.serial = None
     self.serial_args = []
     try: