Android: fixes emulator support in unit test scripts.

build/android/pylib/utils/test_options_parser.py

 # 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.
 
 """Parses options for the instrumentation tests."""
 
 #TODO(craigdh): pylib/utils/ should not depend on pylib/.
 from pylib import constants
 
 import optparse
@@ skipping 108 matching lines @@
                            help='Run the tests from a WebKit checkout.')
   option_parser.add_option('--repeat', dest='repeat', type='int',
                            default=2,
                            help='Repeat count on test timeout.')
   option_parser.add_option('--exit_code', action='store_true',
                            help='If set, the exit code will be total number '
                            'of failures.')
   option_parser.add_option('--exe', action='store_true',
                            help='If set, use the exe test runner instead of '
                            'the APK.')
+  option_parser.add_option('--abi', default='armeabi-v7a',
+                           help='Platform of emulators to launch.')
 
 
 def AddCommonInstrumentationOptions(option_parser):
   """Decorates OptionParser with base instrumentation tests options."""
 
   AddTestRunnerOptions(option_parser)
   option_parser.add_option('-w', '--wait_debugger', dest='wait_for_debugger',
                            action='store_true', help='Wait for debugger.')
   option_parser.add_option('-f', '--test_filter',
                            help='Test filter (if not fully qualified, '
@@ skipping 129 matching lines @@
 
   if not options.package_name:
     option_parser.error('--package-name must be specified.')
 
   if not options.uiautomator_jar:
     option_parser.error('--uiautomator-jar must be specified.')
 
   if not options.uiautomator_info_jar:
     option_parser.error('--uiautomator-info-jar must be specified.')