Fix AVD configuration and defaults based on dogfooder input.

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 41 matching lines @@
                                      'android_tools', 'sdk', 'system-images',
                                      API_TARGET, 'x86'))
 
 
 def CheckKVM():
   """Check if KVM is enabled.
 
   Returns:
     True if kvm-ok returns 0 (already enabled)
   """
-  rc = cmd_helper.RunCmd(['kvm-ok'])
+  try:
+    rc = cmd_helper.RunCmd(['kvm-ok'])
+  except Exception, e:

[frankf, 2013/04/09 17:16:48]

please avoid using general exceptions.

[navabi, 2013/04/09 21:53:55]

Done. Rebased with this committed CL as part of fix:
https://chromiumcodereview.appspot.com/13300002/diff/9001/build/android/insta...

+    logging.info('kvm-ok not installed')
+    return False
   return not rc
 
 
 def GetSDK():
   """Download the SDK and unzip in android_tools directory."""
   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...'
@@ skipping 51 matching lines @@
   logging.basicConfig(level=logging.INFO,
                       format='# %(asctime)-15s: %(message)s')
   run_tests_helper.SetLogLevel(verbose_count=1)
 
   # Calls below will download emulator SDK and/or system images only if needed.
   if CheckSDK():
     logging.info('android_tools directory already exists (not downloading).')
   else:
     GetSDK()
 
+  logging.info('Emulator deps for ARM emulator complete.')
+
   if CheckX86Image():
     logging.info('system-images directory already exists.')
   else:
     GetX86Image()
 
   # 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))