Change install_emulator_deps.py to support Arm build

build/android/avd.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.
 
 """Launches Android Virtual Devices with a set configuration for testing Chrome.
 
 The script will launch a specified number of Android Virtual Devices (AVD's).
 """
 
@@ skipping 37 matching lines @@
                           help='Set sdcard size of the emulators'
                           ' e.g. --sdcard-size=512M')
   run_parser.add_argument('--partition-size', dest='partition_size',
                           default=emulator.DEFAULT_STORAGE_SIZE,
                           help='Default internal storage size'
                           ' e.g. --partition-size=1024M')
   run_parser.add_argument('--launch-without-kill', action='store_false',
                           dest='kill_and_launch', default=True,
                           help='Kill all emulators at launch')
   run_parser.add_argument('--enable-kvm', action='store_true',
-                          dest='enable_kvm', default=False)
+                          dest='enable_kvm', default=False,
+                          help='Enable kvm for faster x86 emulator run')
 
   arguments = arg_parser.parse_args(argv[1:])
 
   logging.root.setLevel(logging.INFO)
 
   if arguments.command == 'kill':
     logging.info('Killing all existing emulator and existing the program')
     emulator.KillAllEmulators()
     return
   if arguments.command == 'delete':
     emulator.DeleteAllTempAVDs()
     return
 
   # Check if SDK exist in ANDROID_SDK_ROOT
   if not install_emulator_deps.CheckSDK():
     raise Exception('Emulator SDK not installed in %s'
                      % constants.ANDROID_SDK_ROOT)
 
-  # Check if KVM is enabled for x86 AVD's and check for x86 system images.
-  # TODO(andrewhayden) Since we can fix all of these with install_emulator_deps
-  # why don't we just run it?
+  # Check if KVM is enabled for x86 AVD
   if arguments.abi == 'x86':
     if not install_emulator_deps.CheckKVM():
       logging.warning('KVM is not installed or enabled')
       arguments.enable_kvm = False
-    elif not install_emulator_deps.CheckX86Image(arguments.api_level):
-      logging.critical('ERROR: System image for x86 AVD not installed. Run '
-                       'install_emulator_deps.py')
-      return 1
+
+  # Check if targeted system image exist
+  if not install_emulator_deps.CheckSystemImage(arguments.abi,
+                                                arguments.api_level):
+    logging.critical('ERROR: System image for %s AVD not installed. Run '
+                     'install_emulator_deps.py', arguments.abi)
+    return 1
 
   # If AVD is specified, check that the SDK has the required target. If not,
   # check that the SDK has the desired target for the temporary AVD's.
   api_level = arguments.api_level
   if arguments.name:
     android = os.path.join(constants.ANDROID_SDK_ROOT, 'tools',
                            'android')
     avds_output = cmd_helper.GetCmdOutput([android, 'list', 'avd'])
     names = re.findall(r'Name: (\w+)', avds_output)
     api_levels = re.findall(r'API level (\d+)', avds_output)
@@ skipping 26 matching lines @@
         arguments.api_level,
         enable_kvm=arguments.enable_kvm,
         kill_and_launch=arguments.kill_and_launch,
         sdcard_size=arguments.sdcard_size,
         storage_size=arguments.partition_size,
         wait_for_boot=True
     )
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))