Android: fixes emulator support in unit test scripts.

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'])
-  return not rc
+  try:
+    return not cmd_helper.RunCmd(['kvm-ok'])
+  except OSError:
+    return False

[navabi, 2013/04/08 20:11:48]

Nice. I have this fix in this patch:
https://codereview.chromium.org/13543008/

Will add you as reviwer for that patch.

 
 
 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...'
     rc = cmd_helper.RunCmd(['unzip', '-o', '/tmp/sdk.zip', '-d', '/tmp/'])
@@ skipping 64 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))