diff options
| author | james.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 10:52:42 +0000 |
|---|---|---|
| committer | james.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 10:52:42 +0000 |
| commit | f59b0879e2b29c67a2694b09dca48497d6480f20 (patch) | |
| tree | 88677791cf41e1cb74efbc8f6fe2dc583edba429 | |
| parent | 6464cc1951ff3da35a77d6a1436e65a4f53ff758 (diff) | |
| download | chromium_src-f59b0879e2b29c67a2694b09dca48497d6480f20.zip chromium_src-f59b0879e2b29c67a2694b09dca48497d6480f20.tar.gz chromium_src-f59b0879e2b29c67a2694b09dca48497d6480f20.tar.bz2 | |
add abi support for emulator.py
Currently arm emulator will always be launched. Adding abi support
to launch corresponding emulator for "TARGET_PRODUCT"
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10690157
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146310 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | build/android/emulator.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/android/emulator.py b/build/android/emulator.py index 86788ac..cd9c674 100755 --- a/build/android/emulator.py +++ b/build/android/emulator.py @@ -148,6 +148,9 @@ class Emulator(object): if not self.fast_and_loose: self._AggressiveImageCleanup() (self.device, port) = self._DeviceName() + abi = 'armeabi' + if 'x86' in os.environ.get('TARGET_PRODUCT', ''): + abi = 'x86' emulator_command = [ self.emulator, # Speed up emulator launch by 40%. Really. @@ -156,7 +159,7 @@ class Emulator(object): # That's not enough for 8 unit test bundles and their data. '-partition-size', '512', # Use a familiar name and port. - '-avd', 'avd_armeabi', + '-avd', 'avd_' + abi, '-port', str(port)] if not self.fast_and_loose: emulator_command.extend([ |