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

build/android/install_emulator_deps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Installs deps for using SDK emulator for testing.
 
 The script will download the SDK and system images, if they are not present, and
 install and enable KVM, if virtualization has been enabled in the BIOS.
 """
@@ skipping 31 matching lines @@
   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
 
 def CheckSDK():
   """Check if SDK is already installed.
 
   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)

[mikecase (-- gone --), 2015/09/12 00:10:16]

Same comment as before.

You will have to rebase this change against
https://codereview.chromium.org/1316413003. John is changing the way we access
some environment variables.

[Yoland Yan(Google), 2015/09/12 01:42:38]

Done

 
 
 def CheckSDKPlatform(api_level=DEFAULT_ANDROID_API_LEVEL):
   """Check if the "SDK Platform" for the specified API level is installed.
      This is necessary in order for the emulator to run when the target
      is specified.
 
   Args:
     api_level: the Android API level to check; defaults to the latest API.
 
   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(
         [android_binary, 'list'])
     if exit_code != 0:
       raise Exception('\'android list\' command failed')
     for line in stdout.split('\n'):
       if pattern.match(line):
         return True
     return False
   except OSError:
     logging.exception('Unable to execute \'android list\'')
     return False
 
 
 def CheckX86Image(api_level=DEFAULT_ANDROID_API_LEVEL):
   """Check if Android system images have been installed.
 
   Args:
     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
+    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():
   """Quickly check whether KVM is enabled.
 
   Returns:
     True iff /dev/kvm exists (Linux only).
   """
   return os.path.exists('/dev/kvm')
 
@@ skipping 53 matching lines @@
                      'AMD SVM).')
 
 
 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.')
-  # 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)
+
+  android_binary = os.path.join(constants.ANDROID_SDK_ROOT, 'tools', 'android')
+
+  pattern = re.compile(

[mikecase (-- gone --), 2015/09/12 00:10:16]

I would change the name from "pattern" to something more specific, even
something like system_image_pattern

[Yoland Yan(Google), 2015/09/12 01:42:38]

Done

+    r'\s*([0-9]+)- Intel x86 Atom System Image, Android API %d.*' % api_level)
+  tmp_cmd = [android_binary, 'list', 'sdk', '--all']

[mikecase (-- gone --), 2015/09/12 00:10:16]

I would change the name to something more specific. Like list_sdk_repo_command

[Yoland Yan(Google), 2015/09/12 01:42:38]

Done

+
+  exit_code, stdout = cmd_helper.GetCmdStatusAndOutput(tmp_cmd)
+
+  if exit_code != 0:
+    raise Exception('\'android list sdk --all\' command return %d' % exit_code)
+  for line in stdout.split('\n'):
+    match = pattern.match(line)
+    if match:
+      index = match.group(1)
+      print 'package %s corresponds to x86 system image with api level %d'

[mikecase (-- gone --), 2015/09/12 00:10:16]

use python logging module

[Yoland Yan(Google), 2015/09/12 01:42:38]

Done

+             % (index, 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)
+
+      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.', timeout=60) == 0:
+        print 'Successfully installed x86 system image for API level %d'

[mikecase (-- gone --), 2015/09/12 00:10:16]

I would use the python logging module instead of print statements.

[Yoland Yan(Google), 2015/09/12 01:42:38]

Done

+               % api_level
+        return
+      else:
+        raise Exception('Failed to install platform update')
+  raise Exception('Could not find android-%d update for the SDK!' % api_level)
 

[mikecase (-- gone --), 2015/09/12 00:10:16]

This code you added is extremely similar to the below GetSDKPlatform function.

Maybe try to factor some of it out. It seems like pretty much only the command
that is run is different.

[Yoland Yan(Google), 2015/09/12 01:42:38]

Done

 
 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
   """
-  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(
       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'])
+      [android_binary, 'list', 'sdk', '--all'])
   if exit_code != 0:
     raise Exception('\'android list sdk\' command return %d' % exit_code)
   for line in stdout.split('\n'):
     match = 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]
+                        '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:
+      if update_process.expect('Done. 1 package installed.', timeout=60) == 0:

[Yoland Yan(Google), 2015/09/11 19:17:22]

It takes a long time to download SDK Platform

         print 'Successfully installed platform for API level %d' % 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 main(argv):
   opt_parser = optparse.OptionParser(
       description='Install dependencies for running the Android emulator')
@@ skipping 37 matching lines @@
 
   # Make sure KVM packages are installed and enabled.
   if CheckKVM():
     logging.info('KVM already installed and enabled.')
   else:
     InstallKVM()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))