Revert of [Android] Clean up old_interface in build/android/.

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 argparse
 import collections
@@ skipping 157 matching lines @@
   api_key_group = group.add_mutually_exclusive_group()
   api_key_group.add_argument('--api-key', default='',
                              help='API key for remote devices.')
   api_key_group.add_argument('--api-key-file', default='',
                              help='Path to file that contains API key.')
 
 
 def AddDeviceOptions(parser):
   """Adds device options to |parser|."""
   group = parser.add_argument_group(title='Device Options')
+  group.add_argument('-c', dest='cleanup_test_files',
+                     help='Cleanup test files on the device after run',
+                     action='store_true')
   group.add_argument('--tool',
                      dest='tool',
                      help=('Run the test under a tool '
                            '(use --tool help to list them)'))
   group.add_argument('-d', '--device', dest='test_device',
                      help=('Target device for the test suite '
                            'to run on.'))
 
 
 def AddGTestOptions(parser):
@@ skipping 174 matching lines @@
       constants.SDK_BUILD_TEST_JAVALIB_DIR,
       '%s.jar' %  args.test_apk)
   args.test_support_apk_path = '%sSupport%s' % (
       os.path.splitext(args.test_apk_path))
 
   args.test_runner = apk_helper.GetInstrumentationName(args.test_apk_path)
 
   # TODO(jbudorick): Get rid of InstrumentationOptions.
   return instrumentation_test_options.InstrumentationOptions(
       args.tool,
+      args.cleanup_test_files,
       args.annotations,
       args.exclude_annotations,
       args.test_filter,
       args.test_data,
       args.save_perf_json,
       args.screenshot_failures,
       args.wait_for_debugger,
       args.coverage_dir,
       args.test_apk,
       args.test_apk_path,
@@ skipping 44 matching lines @@
     args.uiautomator_jar = os.path.join(
         constants.GetOutDirectory(),
         constants.SDK_BUILD_JAVALIB_DIR,
         '%s.dex.jar' % args.test_jar)
   args.uiautomator_info_jar = (
       args.uiautomator_jar[:args.uiautomator_jar.find('.dex.jar')] +
       '_java.jar')
 
   return uiautomator_test_options.UIAutomatorOptions(
       args.tool,
+      args.cleanup_test_files,
       args.annotations,
       args.exclude_annotations,
       args.test_filter,
       args.test_data,
       args.save_perf_json,
       args.screenshot_failures,
       args.uiautomator_jar,
       args.uiautomator_info_jar,
       args.package,
       args.set_asserts)
@@ skipping 178 matching lines @@
 
 
 def _RunGTests(args, devices):
   """Subcommand of RunTestsCommands which runs gtests."""
   exit_code = 0
   for suite_name in args.suite_name:
     # TODO(jbudorick): Either deprecate multi-suite or move its handling down
     # into the gtest code.
     gtest_options = gtest_test_options.GTestOptions(
         args.tool,
+        args.cleanup_test_files,
         args.test_filter,
         args.run_disabled,
         args.test_arguments,
         args.timeout,
         args.isolate_file_path,
         suite_name)
     runner_factory, tests = gtest_setup.Setup(gtest_options, devices)
 
     results, test_exit_code = test_dispatcher.RunTests(
         tests, runner_factory, devices, shard=True, test_timeout=None,
@@ skipping 373 matching lines @@
       return constants.INFRA_EXIT_CODE
     else:
       return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())