add abi support for emulator.py

build/android/emulator.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Provides an interface to start and stop Android emulator.
 
 Assumes system environment ANDROID_NDK_ROOT has been set.
 
@@ skipping 130 matching lines @@
     """Launches the emulator asynchronously. Call ConfirmLaunch() to ensure the
     emulator is ready for use.
 
     If fails, an exception will be raised.
     """
     if kill_all_emulators:
       _KillAllEmulators()  # just to be sure
     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.
         '-no-boot-anim',
         # The default /data size is 64M.
         # 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([
           # Wipe the data.  We've seen cases where an emulator
           # gets 'stuck' if we don't do this (every thousand runs or
           # so).
           '-wipe-data',
           ])
     logging.info('Emulator launch command: %s', ' '.join(emulator_command))
     self.popen = subprocess.Popen(args=emulator_command,
@@ skipping 73 matching lines @@
     """Install a handler to kill the emulator when we exit unexpectedly."""
     for sig in self._SIGNALS:
       signal.signal(sig, self._ShutdownOnSignal)
 
 def main(argv):
   Emulator(True).Launch(True)
 
 
 if __name__ == '__main__':
   main(sys.argv)