Use generated android wrapper scripts in runtest.py

scripts/slave/runtest.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.
 
 """A tool used to run a Chrome test executable and process the output.
 
 This script is used by the buildbot slaves. It must be run from the outer
 build directory, e.g. chrome-release/build/.
 
@@ skipping 1504 matching lines @@
 
   Returns:
     Exit status code.
   """
   if not os.environ.get('CHROMIUM_OUTPUT_DIR') and options.target:
     extra_env['CHROMIUM_OUTPUT_DIR'] = (
         os.path.abspath(os.path.join(options.build_dir, options.target)))
   if options.run_python_script:
     return _MainLinux(options, args, extra_env)
 
-  if len(args) < 1:
-    raise chromium_utils.MissingArgument('Usage: %s' % USAGE)
-
-  if _ListLogProcessors(options.annotate):
-    return 0
-  log_processor_class = _SelectLogProcessor(options, False)
-  log_processor = _CreateLogProcessor(log_processor_class, options, None)
-
-  if options.generate_json_file:
-    if os.path.exists(options.test_output_xml):
-      # remove the old XML output file.
-      os.remove(options.test_output_xml)
-
-  # Assume it's a gtest apk, so use the android harness.
-  test_suite = args[0]
-  run_test_target_option = '--release'
-  if options.target == 'Debug':
-    run_test_target_option = '--debug'
-  command = ['src/build/android/test_runner.py', 'gtest',
-             run_test_target_option, '-s', test_suite]
-
-  if options.flakiness_dashboard_server:
-    command += ['--flakiness-dashboard-server=%s' %
-        options.flakiness_dashboard_server]
-
-  result = _RunGTestCommand(
-      options, command, extra_env, log_processor=log_processor)
-
-  if options.generate_json_file:
-    if not _GenerateJSONForTestResults(options, log_processor):
-      return 1
-
-  if options.annotate:
-    annotation_utils.annotate(
-        options.test_type, result, log_processor,
-        perf_dashboard_id=options.perf_dashboard_id)
-
-  if options.results_url:
-    if not _SendResultsToDashboard(
-        log_processor, _ResultsDashboardDict(options)):
-      return 1
-
-  return result
+  raise Exception('runtest.py without --run-python-script not supported for '
+                  'Android')
 
 
 def _UpdateRunBenchmarkArgs(args, options):
   """Updates the arguments for telemetry run_benchmark commands.
 
   Ensures that --output=chartjson is set and adds a --output argument.
 
   Arguments:
     args: list of command line arguments, starts with 'run_benchmark' for
           telemetry tests.
@@ skipping 364 matching lines @@
   finally:
     if did_launch_dbus:
       # It looks like the command line argument --exit-with-session
       # isn't working to clean up the spawned dbus-daemon. Kill it
       # manually.
       _ShutdownDBus()
 
 
 if '__main__' == __name__:
   sys.exit(main())