Android Add _incremental targets for instrumentation tests

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 40 matching lines @@
   parser.add_argument('--depfile',
                       help='Path to the depfile. This must be specified as '
                            "the action's first output.")
   # We need to intercept any test runner path arguments and make all
   # 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('--isolate-file-path')
   group.add_argument('--output-directory')
   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))
 
   test_runner_path = os.path.join(
       os.path.dirname(__file__), os.path.pardir, 'test_runner.py')
   test_runner_path = RelativizePathToScript(test_runner_path)
 
   test_runner_path_args = []
   if args.additional_apk_list:
     args.additional_apks.extend(
         build_utils.ParseGypList(args.additional_apk_list))
   if args.additional_apks:
     test_runner_path_args.extend(
         ('--additional-apk', RelativizePathToScript(a))
         for a in args.additional_apks)
   if args.apk_under_test:
     test_runner_path_args.append(
         ('--apk-under-test', RelativizePathToScript(args.apk_under_test)))
+  if args.apk_under_test_incremental_install_script:
+    test_runner_path_args.append(
+        ('--apk-under-test-incremental-install-script',
+         RelativizePathToScript(
+             args.apk_under_test_incremental_install_script)))
   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.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,
         build_utils.GetPythonDependencies())
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))