[android] Stop using isolate.py for data dependency management. (RELAND)

build/android/gyp/create_test_runner_script.py

 #!/usr/bin/env python
 #
 # Copyright 2015 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.
 
 """Creates a script to run an android test using build/android/test_runner.py.
 """
 
 import argparse
@@ skipping 44 matching lines @@
   # of the paths relative to the output script directory.
   group = parser.add_argument_group('Test runner path arguments.')
   group.add_argument('--additional-apk', action='append',
                      dest='additional_apks', default=[])
   group.add_argument('--additional-apk-list')
   group.add_argument('--apk-under-test')
   group.add_argument('--apk-under-test-incremental-install-script')
   group.add_argument('--executable-dist-dir')
   group.add_argument('--isolate-file-path')
   group.add_argument('--output-directory')
+  group.add_argument('--runtime-deps-path')
   group.add_argument('--test-apk')
   group.add_argument('--test-apk-incremental-install-script')
   group.add_argument('--coverage-dir')
   args, test_runner_args = parser.parse_known_args(
       build_utils.ExpandFileArgs(args))
 
   def RelativizePathToScript(path):
     """Returns the path relative to the output script directory."""
     return os.path.relpath(path, os.path.dirname(args.script_output_path))
 
@@ skipping 20 matching lines @@
   if args.executable_dist_dir:
     test_runner_path_args.append(
         ('--executable-dist-dir',
          RelativizePathToScript(args.executable_dist_dir)))
   if args.isolate_file_path:
     test_runner_path_args.append(
         ('--isolate-file-path', RelativizePathToScript(args.isolate_file_path)))
   if args.output_directory:
     test_runner_path_args.append(
         ('--output-directory', RelativizePathToScript(args.output_directory)))
+  if args.runtime_deps_path:
+    test_runner_path_args.append(
+        ('--runtime-deps-path', RelativizePathToScript(args.runtime_deps_path)))
   if args.test_apk:
     test_runner_path_args.append(
         ('--test-apk', RelativizePathToScript(args.test_apk)))
   if args.test_apk_incremental_install_script:
     test_runner_path_args.append(
         ('--test-apk-incremental-install-script',
          RelativizePathToScript(args.test_apk_incremental_install_script)))
   if args.coverage_dir:
     test_runner_path_args.append(
         ('--coverage-dir', RelativizePathToScript(args.coverage_dir)))
 
   with open(args.script_output_path, 'w') as script:
     script.write(SCRIPT_TEMPLATE.format(
         test_runner_path=str(test_runner_path),
         test_runner_args=str(test_runner_args),
         test_runner_path_args=str(test_runner_path_args)))
 
   os.chmod(args.script_output_path, 0750)
 
   if args.depfile:
     build_utils.WriteDepfile(args.depfile, args.script_output_path)
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))