add abi support for emulator.py

build/android/emulator.py

Index: build/android/emulator.py
diff --git a/build/android/emulator.py b/build/android/emulator.py
index 6b53416e8e5df2a825a79cc97cbd347b09f093de..bf07ad493281abc2a06685eead99883ac75ea82c 100755
--- a/build/android/emulator.py
+++ b/build/android/emulator.py
@@ -148,6 +148,11 @@ class Emulator(object):
     if not self.fast_and_loose:
       self._AggressiveImageCleanup()
     (self.device, port) = self._DeviceName()
+    abi = os.environ.get("TARGET_PRODUCT")
+    if abi and "x86" in abi:

[bulach, 2012/07/12 07:45:06]

nit: single quotes here and in 151..
however, I think 151-155 would be clearer as:

abi = 'armeabi'
if 'x86' in os.environ.get('TARGET_PRODUCT', ''):
  abi = 'x86'

[Wei James(wistoch), 2012/07/12 08:09:55]

fixed. and thanks for the suggestion. agree that it is clearer. 

thanks 

+      abi = 'x86'
+    else:
+      abi = 'armeabi'
     emulator_command = [
         self.emulator,
         # Speed up emulator launch by 40%.  Really.
@@ -156,7 +161,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([