Download the Android SDK as a CIPD package

scripts/slave/recipe_modules/skia/android_flavor.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import android_devices
 import copy
 import default_flavor
 
 
@@ skipping 50 matching lines @@
 
 class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
   def __init__(self, skia_api):
     super(AndroidFlavorUtils, self).__init__(skia_api)
     self.device = self._skia_api.builder_spec['device_cfg']
     slave_info = android_devices.SLAVE_INFO.get(
         self._skia_api.slave_name,
         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:
       path_to_adb = self._skia_api.m.step(
           'which adb',
           cmd=['which', 'adb'],
           stdout=self._skia_api.m.raw_io.output(),
           infra_step=True).stdout.rstrip()
     except self._skia_api.m.step.StepFailure:
       path_to_adb = self._skia_api.m.path.join(self._android_sdk_root,
@@ skipping 224 matching lines @@
     ).stdout.rstrip()
     prefix = self.device_path_join(device_scratch_dir, 'skiabot', 'skia_')
     return default_flavor.DeviceDirs(
         dm_dir=prefix + 'dm',
         perf_data_dir=prefix + 'perf',
         resource_dir=prefix + 'resources',
         images_dir=prefix + 'images',
         skp_dir=prefix + 'skp/skps',
         tmp_dir=prefix + 'tmp_dir')