fix emulator.py by using Android SDK in third_party/android_tools instead of downloading adt

build/android/install_emulator_deps.py

Index: build/android/install_emulator_deps.py
diff --git a/build/android/install_emulator_deps.py b/build/android/install_emulator_deps.py
index 31fcbf0becf5bea536f17f5681af47430142f2b2..37ef60a64a781cc146483c8e7b7eef7afcbaae9f 100755
--- a/build/android/install_emulator_deps.py
+++ b/build/android/install_emulator_deps.py
@@ -14,7 +14,6 @@ import logging
 import optparse
 import os
 import re
-import shutil
 import sys
 
 from devil.utils import cmd_helper
@@ -25,23 +24,9 @@ from pylib import pexpect
 # Android API level
 DEFAULT_ANDROID_API_LEVEL = constants.ANDROID_SDK_VERSION
 
-# From the Android Developer's website.
-# Keep this up to date; the user can install older API levels as necessary.
-SDK_BASE_URL = 'http://dl.google.com/android/adt'
-SDK_ZIP = 'adt-bundle-linux-x86_64-20131030.zip'
-
-# pylint: disable=line-too-long
-# Android x86 system image from the Intel website:
-# http://software.intel.com/en-us/articles/intel-eula-x86-android-4-2-jelly-bean-bin
-# These don't exist prior to Android-15.
-# As of 08 Nov 2013, Android-19 is not yet available either.
-X86_IMG_URLS = {
-  15: 'https://software.intel.com/sites/landingpage/android/sysimg_x86-15_r01.zip',
-  16: 'https://software.intel.com/sites/landingpage/android/sysimg_x86-16_r01.zip',
-  17: 'https://software.intel.com/sites/landingpage/android/sysimg_x86-17_r01.zip',
-  18: 'https://software.intel.com/sites/landingpage/android/sysimg_x86-18_r01.zip',
-  19: 'https://software.intel.com/sites/landingpage/android/sysimg_x86-19_r01.zip'}
-#pylint: enable=line-too-long
+# Default Time out for downloading SDK component
+DOWNLOAD_SYSTEM_IMAGE_TIMEOUT = 30
+DOWNLOAD_SDK_PLATFORM_TIMEOUT = 60
 
 def CheckSDK():
   """Check if SDK is already installed.
@@ -49,7 +34,7 @@ def CheckSDK():
   Returns:
     True if the emulator SDK directory (src/android_emulator_sdk/) exists.
   """
-  return os.path.exists(constants.EMULATOR_SDK_ROOT)
+  return os.path.exists(constants.ANDROID_SDK_ROOT)
 
 
 def CheckSDKPlatform(api_level=DEFAULT_ANDROID_API_LEVEL):
@@ -63,8 +48,7 @@ def CheckSDKPlatform(api_level=DEFAULT_ANDROID_API_LEVEL):
   Returns:
     True if the platform is already installed.
   """
-  android_binary = os.path.join(constants.EMULATOR_SDK_ROOT,
-                                'sdk', 'tools', 'android')
+  android_binary = os.path.join(constants.ANDROID_SDK_ROOT, 'tools', 'android')
   pattern = re.compile('id: [0-9]+ or "android-%d"' % api_level)
   try:
     exit_code, stdout = cmd_helper.GetCmdStatusAndOutput(
@@ -87,13 +71,13 @@ def CheckX86Image(api_level=DEFAULT_ANDROID_API_LEVEL):
     api_level: the Android API level to check for; defaults to the latest API.
 
   Returns:
-    True if sdk/system-images/android-<api_level>/x86 exists inside
-    EMULATOR_SDK_ROOT.
+    True if sdk/system-images/android-<api_level>/default/x86 exists inside

[mikecase (-- gone --), 2015/10/07 17:45:38]

Not a very useful comment since it says exactly what the code does. Either
delete, or change to something like "True if x86 image has been previously
downloaded." or "True if x86 image exists".

[Yoland Yan(Google), 2015/10/08 01:48:12]

Done

+    ANDROID_SDK_ROOT.
   """
   api_target = 'android-%d' % api_level
-  return os.path.exists(os.path.join(constants.EMULATOR_SDK_ROOT,
-                                     'sdk', 'system-images',
-                                     api_target, 'x86'))
+  return os.path.exists(os.path.join(constants.ANDROID_SDK_ROOT,
+                                     'system-images', api_target, 'default',
+                                     'x86'))
 
 
 def CheckKVM():
@@ -122,25 +106,6 @@ def RunKvmOk():
     return False
 
 
-def GetSDK():
-  """Download the SDK and unzip it into EMULATOR_SDK_ROOT."""
-  logging.info('Download Android SDK.')
-  sdk_url = '%s/%s' % (SDK_BASE_URL, SDK_ZIP)
-  try:
-    cmd_helper.RunCmd(['curl', '-o', '/tmp/sdk.zip', sdk_url])
-    print 'curled unzipping...'
-    rc = cmd_helper.RunCmd(['unzip', '-o', '/tmp/sdk.zip', '-d', '/tmp/'])
-    if rc:
-      raise Exception('ERROR: could not download/unzip Android SDK.')
-    # Get the name of the sub-directory that everything will be extracted to.
-    dirname, _ = os.path.splitext(SDK_ZIP)
-    zip_dir = '/tmp/%s' % dirname
-    # Move the extracted directory to EMULATOR_SDK_ROOT
-    shutil.move(zip_dir, constants.EMULATOR_SDK_ROOT)
-  finally:
-    os.unlink('/tmp/sdk.zip')
-
-
 def InstallKVM():
   """Installs KVM packages."""
   rc = cmd_helper.RunCmd(['sudo', 'apt-get', 'install', 'kvm'])
@@ -160,95 +125,102 @@ def InstallKVM():
                      'AMD SVM).')
 
 
-def GetX86Image(api_level=DEFAULT_ANDROID_API_LEVEL):
-  """Download x86 system image from Intel's website.
+def UpdateSDK(api_level, package_name, package_pattern, timeout):

[mikecase (-- gone --), 2015/10/07 17:45:38]

Do you remember where the sdk gets downloaded? My concern is that if its within
the Chromium repo, idk if the bots will wipe the downloaded files (I will have
to check into what they do when they sync). If so, they will have to redownload
them every bot run. I don't think this is will be a problem, but it is something
to keep in mind.

[Yoland Yan(Google), 2015/10/08 01:48:12]

It's downloaded to third_party/android_tools/sdk/. This script can't download
sdk though, it can only use sdk to download platform and emulator images.

+  '''This function update SDK with a filter index.

[mikecase (-- gone --), 2015/10/07 17:45:38]

nit: Use double quotes for multiline comments. The code review tool doesn't seem
to like this style (the rest of this file appears commented) and we just use
double quotes elsewhere.

[Yoland Yan(Google), 2015/10/08 01:48:12]

Done

[Yoland Yan(Google), 2015/10/08 01:48:12]

Done

 
   Args:
     api_level: the Android API level to download for.
-  """
-  logging.info('Download x86 system image directory into sdk directory.')
-  # TODO(andrewhayden): Use python tempfile lib instead
-  temp_file = '/tmp/x86_img_android-%d.zip' % api_level
-  if api_level not in X86_IMG_URLS:
-    raise Exception('ERROR: no URL known for x86 image for android-%s' %
-                    api_level)
-  try:
-    cmd_helper.RunCmd(['curl', '-o', temp_file, X86_IMG_URLS[api_level]])
-    rc = cmd_helper.RunCmd(['unzip', '-o', temp_file, '-d', '/tmp/'])
-    if rc:
-      raise Exception('ERROR: Could not download/unzip image zip.')
-    api_target = 'android-%d' % api_level
-    sys_imgs = os.path.join(constants.EMULATOR_SDK_ROOT, 'sdk',
-                            'system-images', api_target, 'x86')
-    logging.info('Deploying system image to %s', sys_imgs)
-    shutil.move('/tmp/x86', sys_imgs)
-  finally:
-    os.unlink(temp_file)
+    package_name: logging name of package that is being updated.
+    package_pattern: the pattern to match the filter index from.
+    timeout: the amount of time wait for update command.
+  '''
+  android_binary = os.path.join(constants.ANDROID_SDK_ROOT, 'tools', 'android')
 
+  list_sdk_repo_command = [android_binary, 'list', 'sdk', '--all']
 
-def GetSDKPlatform(api_level=DEFAULT_ANDROID_API_LEVEL):
-  """Update the SDK to include the platform specified.
+  exit_code, stdout = cmd_helper.GetCmdStatusAndOutput(list_sdk_repo_command)
 
-  Args:
-    api_level: the Android API level to download
-  """
-  android_binary = os.path.join(constants.EMULATOR_SDK_ROOT,
-                                'sdk', 'tools', 'android')
-  pattern = re.compile(
-      r'\s*([0-9]+)- SDK Platform Android [\.,0-9]+, API %d.*' % api_level)
-  # Example:
-  #   2- SDK Platform Android 4.3, API 18, revision 2
-  exit_code, stdout = cmd_helper.GetCmdStatusAndOutput(
-      [android_binary, 'list', 'sdk'])
   if exit_code != 0:
-    raise Exception('\'android list sdk\' command return %d' % exit_code)
+    raise Exception('\'android list sdk --all\' command return %d' % exit_code)
+
   for line in stdout.split('\n'):
-    match = pattern.match(line)
+    match = package_pattern.match(line)
     if match:
       index = match.group(1)
-      print 'package %s corresponds to platform level %d' % (index, api_level)
-      # update sdk --no-ui --filter $INDEX
-      update_command = [android_binary,
-                        'update', 'sdk', '--no-ui', '--filter', index]
+      logging.info('package %s corresponds to %s with api level %d'
+                   % (index, package_name, api_level))
+      update_command = [android_binary, 'update', 'sdk', '--no-ui', '--all',
+                         '--filter', index]
       update_command_str = ' '.join(update_command)
       logging.info('running update command: %s', update_command_str)
       update_process = pexpect.spawn(update_command_str)
-      # TODO(andrewhayden): Do we need to bug the user about this?
+
       if update_process.expect('Do you accept the license') != 0:
         raise Exception('License agreement check failed')
       update_process.sendline('y')
-      if update_process.expect('Done. 1 package installed.') == 0:
-        print 'Successfully installed platform for API level %d' % api_level
+      if update_process.expect(
+        'Done. 1 package installed.', timeout=timeout) == 0:
+        logging.info('Successfully installed %s for API level %d'
+                      % (package_name, api_level))
         return
       else:
         raise Exception('Failed to install platform update')
   raise Exception('Could not find android-%d update for the SDK!' % api_level)
 
+def GetX86Image(api_level=DEFAULT_ANDROID_API_LEVEL):
+  """Download x86 system image from Intel's website.
+
+  Args:
+    api_level: the Android API level to download for.
+  """
+  logging.info('Download x86 system image directory into sdk directory.')
+
+  x86_package_pattern = re.compile(
+    r'\s*([0-9]+)- Intel x86 Atom System Image, Android API %d.*' % api_level)
+
+  UpdateSDK(api_level, 'x86 system image', x86_package_pattern,
+            DOWNLOAD_SYSTEM_IMAGE_TIMEOUT)
+
+def GetSDKPlatform(api_level=DEFAULT_ANDROID_API_LEVEL):
+  """Update the SDK to include the platform specified.
+
+  Args:
+    api_level: the Android API level to download
+  """
+  logging.info('Download SDK Platform directory into sdk directory.')
+
+  platform_package_pattern = re.compile(
+      r'\s*([0-9]+)- SDK Platform Android [\.,0-9]+, API %d.*' % api_level)
+
+  UpdateSDK(api_level, 'SDK Platform', platform_package_pattern,
+            DOWNLOAD_SDK_PLATFORM_TIMEOUT)
+
 
 def main(argv):
   opt_parser = optparse.OptionParser(
       description='Install dependencies for running the Android emulator')
-  opt_parser.add_option('--api-level', dest='api_level',
-      help='The API level (e.g., 19 for Android 4.4) to ensure is available',
-      type='int', default=DEFAULT_ANDROID_API_LEVEL)
-  opt_parser.add_option('-v', dest='verbose', action='store_true',
-      help='enable verbose logging')
+  opt_parser.add_option('--api-level',
+                        dest='api_level',
+                        help=('The API level (e.g., 19 for Android 4.4) to '
+                              'ensure is available'),
+                        type='int',
+                        default=DEFAULT_ANDROID_API_LEVEL)
+  opt_parser.add_option('-v',
+                        dest='verbosity',
+                        default=1,
+                        action='count',
+                        help='enable INFO logging')
   options, _ = opt_parser.parse_args(argv[1:])
 
-  # run_tests_helper will set logging to INFO or DEBUG
-  # We achieve verbose output by configuring it with 2 (==DEBUG)
-  verbosity = 1
-  if options.verbose:
-    verbosity = 2
-  logging.basicConfig(level=logging.INFO,
-                      format='# %(asctime)-15s: %(message)s')
-  run_tests_helper.SetLogLevel(verbose_count=verbosity)
+  run_tests_helper.SetLogLevel(verbose_count=options.verbosity)
 
   # Calls below will download emulator SDK and/or system images only if needed.
   if CheckSDK():
     logging.info('android_emulator_sdk/ already exists, skipping download.')
   else:
-    GetSDK()
+    logging.critical('ERROR: Emulator SDK not installed in %s'
+                     % constants.ANDROID_SDK_ROOT)
+    return 1
 
   # Check target. The target has to be installed in order to run the emulator.
   if CheckSDKPlatform(options.api_level):