[Android] Configurable instrumentation test runner + test SDK levels.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 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.
 
 """Runs all types of tests from one unified interface."""
 
 import collections
 import logging
@@ skipping 17 matching lines @@
 from pylib.host_driven import setup as host_driven_setup
 from pylib.instrumentation import setup as instrumentation_setup
 from pylib.instrumentation import test_options as instrumentation_test_options
 from pylib.monkey import setup as monkey_setup
 from pylib.monkey import test_options as monkey_test_options
 from pylib.perf import setup as perf_setup
 from pylib.perf import test_options as perf_test_options
 from pylib.perf import test_runner as perf_test_runner
 from pylib.uiautomator import setup as uiautomator_setup
 from pylib.uiautomator import test_options as uiautomator_test_options
+from pylib.utils import apk_helper
 from pylib.utils import command_option_parser
 from pylib.utils import report_results
 from pylib.utils import reraiser_thread
 from pylib.utils import run_tests_helper
 
 
 def AddCommonOptions(option_parser):
   """Adds all common options to |option_parser|."""
 
   group = optparse.OptionGroup(option_parser, 'Common Options')
@@ skipping 214 matching lines @@
   elif options.python_only:
     options.run_java_tests = False
 
   if not options.host_driven_root:
     options.run_python_tests = False
 
   if not options.test_apk:
     error_func('--test-apk must be specified.')
 
 
-  options.test_apk_path = os.path.join(constants.GetOutDirectory(),
-                                       constants.SDK_BUILD_APKS_DIR,
-                                       '%s.apk' % options.test_apk)
+  options.test_apk_path = os.path.join(
+      constants.GetOutDirectory(),
+      constants.SDK_BUILD_APKS_DIR,
+      '%s.apk' % options.test_apk)
   options.test_apk_jar_path = os.path.join(
       constants.GetOutDirectory(),
       constants.SDK_BUILD_TEST_JAVALIB_DIR,
       '%s.jar' %  options.test_apk)
+  options.test_support_apk_path = '%sSupport%s' % (
+      os.path.splitext(options.test_apk_path))
 
-  options.test_support_apk_path = '%sSupport%s' % (
-        os.path.splitext(options.test_apk_path))
-
+  options.test_runner = apk_helper.GetInstrumentationName(options.test_apk_path)
 
   return instrumentation_test_options.InstrumentationOptions(
       options.tool,
       options.cleanup_test_files,
       options.push_deps,
       options.annotations,
       options.exclude_annotations,
       options.test_filter,
       options.test_data,
+      options.test_runner,
       options.save_perf_json,
       options.screenshot_failures,
       options.wait_for_debugger,
       options.coverage_dir,
       options.test_apk,
       options.test_apk_path,
       options.test_apk_jar_path,
       options.test_support_apk_path
       )
 
@@ skipping 522 matching lines @@
 
 def main():
   signal.signal(signal.SIGUSR1, DumpThreadStacks)
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main())