Fix AVD configuration and defaults based on dogfooder input.

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 ff84367a7ec0bf7fed7d4a890cf0ae79c411ca66..aaf7931409387f0b89561163235201adc665133b 100755
--- a/build/android/install_emulator_deps.py
+++ b/build/android/install_emulator_deps.py
@@ -59,7 +59,11 @@ def CheckKVM():
   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
 
 
@@ -136,6 +140,8 @@ def main(argv):
   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.')