Add incremental_apk_by_default GN arg.

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
 import os
+import re
 import sys
 
 from util import build_utils
 
 SCRIPT_TEMPLATE = """\
 #!/usr/bin/env python
 #
 # This file was generated by build/android/gyp/create_test_runner_script.py
 
 import os
@@ skipping 13 matching lines @@
   for arg, path in test_runner_path_args:
     test_runner_args.extend([arg, ResolvePath(path)])
 
   os.execv(test_runner_path,
            [test_runner_path] + test_runner_args + sys.argv[1:])
 
 if __name__ == '__main__':
   sys.exit(main())
 """
 
+
+def _GetTargetFromIncrementalApk(incremental_apk):

[agrieve, 2016/12/15 16:22:30]

We have a convention that makes the apk_name reflect the target_name, but I
don't think GN actually enforces this.

Even having a message like this is fairly generous, so I think it'd be fine to
just have the message complain about the file names rather than target_names

[estevenson, 2016/12/15 18:19:06]

Done.

+  apk = re.match(r'^.*/(.*)_incremental.apk$', incremental_apk).group(1)
+  apk_target = '_'.join(re.findall(r'([A-Z][^A-Z]*)', apk))
+  return apk_target.lower() + '_apk'
+
+
+def _GenerateAdditionalApksErrorString(incremental_apks):
+  err_string = ('Apks that are listed as additional_apks for '
+  'another target cannot be incremental. Please add never_incremental to the '

[agrieve, 2016/12/15 16:22:30]

nit: indent 4 spaces

[estevenson, 2016/12/15 18:19:06]

Done.

+  'following apks: %s')
+  return err_string % ', '.join(
+        _GetTargetFromIncrementalApk(a) for a in incremental_apks)
+
+
 def main(args):
   parser = argparse.ArgumentParser()
   parser.add_argument('--script-output-path',
                       help='Output path for executable script.')
   parser.add_argument('--depfile',
                       help='Path to the depfile. This must be specified as '
                            "the action's first output.")
   parser.add_argument('--test-runner-path',
                       help='Path to test_runner.py (optional).')
   # 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('--additional-apk-incremental', action='append',
+                     dest='additional_apks_incremental', default=[])
   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-jar')
   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 = args.test_runner_path or 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.ParseGnList(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.additional_apks_incremental:
+    bad_additional_apks = [a for a in args.additional_apks_incremental
+                           if a != 'None']
+    if bad_additional_apks:
+      raise Exception(_GenerateAdditionalApksErrorString(bad_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.executable_dist_dir:
     test_runner_path_args.append(
@@ skipping 28 matching lines @@
         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:]))