summaryrefslogtreecommitdiffstats
path: root/build/android/pylib/utils/emulator.py
diff options
context:
space:
mode:
authorshouqun.liu@intel.com <shouqun.liu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 05:40:41 +0000
committershouqun.liu@intel.com <shouqun.liu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 05:40:41 +0000
commit31fcd34da3797bc49160620ef8c94a38652c0587 (patch)
treef387bbdd2c3331b0a0b6f0e3a7e5bc49533550df /build/android/pylib/utils/emulator.py
parent3b403ab2a4bd7f85b00bd6c454fe1cb6493c95f2 (diff)
downloadchromium_src-31fcd34da3797bc49160620ef8c94a38652c0587.zip
chromium_src-31fcd34da3797bc49160620ef8c94a38652c0587.tar.gz
chromium_src-31fcd34da3797bc49160620ef8c94a38652c0587.tar.bz2
Android: fixes emulator support in unit test scripts.
* Catch exception in CheckKVM in case kvm-ok is not available. * Add abi option for launching emulator. This patch is contributed by Wu Hengzhi (hengzhix.wu@intel.com). BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/13300002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib/utils/emulator.py')
-rwxr-xr-xbuild/android/pylib/utils/emulator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/android/pylib/utils/emulator.py b/build/android/pylib/utils/emulator.py
index df77c52..d2943549 100755
--- a/build/android/pylib/utils/emulator.py
+++ b/build/android/pylib/utils/emulator.py
@@ -213,7 +213,7 @@ class Emulator(object):
'--silent',
'delete',
'avd',
- '--name', self.avd,
+ '--name', self.avd_name,
]
avd_process = subprocess.Popen(args=avd_command,
stdout=subprocess.PIPE,