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:
+    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 56 matching lines @@
   if CheckSDK():
     logging.info('android_tools directory already exists (not downloading).')
   else:
     GetSDK()
 
   if CheckX86Image():
     logging.info('system-images directory already exists.')
   else:
     GetX86Image()
 
+  logging.info('Emulator deps for ARM emulator complete.')

[pasko-google - do not use, 2013/04/05 09:41:05]

s/ARM/X86/

[navabi, 2013/04/08 21:41:56]

This log statement is to indicate the deps are ready for ARM, not x86. For x86
the InstallKVM below needs to succeed, but it may not if the machine has not
enabled virtualization.

The point is, the user runs install_emulator_deps.py without virtualization
enabled in BIOS, and they know they can only run the ARM emulator.

It should go before the CheckX86Images. I moved it.

[pasko-google - do not use, 2013/04/09 08:41:45]

Oh yes, thanks. The confusing part was exactly this: declaring complete ARM
stuff right after X86 specific work.

It would still be a little weird to see "Emulator deps for ARM emulator
complete." when the only thing the user needs is an X86 emulator. So instead it
could be "Android SDK setup complete." But up to you, if you think it helps,
change it.

+
   # 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))