Android: fixes emulator support in unit test scripts.

build/android/pylib/gtest/dispatch.py

 # 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.
 
 import copy
 import fnmatch
 import logging
 import os
 
 from pylib import android_commands
@@ skipping 102 matching lines @@
     options: options for running the tests.
     suite_name: name of the test suite being run.
 
   Returns:
     0 if successful, number of failing tests otherwise.
   """
   step_name = os.path.basename(options.test_suite).replace('-debug.apk', '')
   attached_devices = []
   buildbot_emulators = []
 
+  if options.abi == 'arm':
+    options.abi = 'armeabi-v7a'
+
   if options.use_emulator:
     buildbot_emulators = emulator.LaunchEmulators(options.emulator_count,
+                                                  options.abi,
                                                   wait_for_boot=True)
     attached_devices = [e.device for e in buildbot_emulators]
   elif options.test_device:
     attached_devices = [options.test_device]
   else:
     attached_devices = android_commands.GetAttachedDevices()
 
   if not attached_devices:
     logging.critical('A device must be attached and online.')
     return 1
@@ skipping 77 matching lines @@
   failures = 0
   for suite_name, suite_path in all_test_suites:
     # Give each test suite its own copy of options.
     test_options = copy.deepcopy(options)
     test_options.test_suite = suite_path
     failures += _RunATestSuite(test_options, suite_name)
 
   if options.use_xvfb:
     framebuffer.Stop()
   return failures