[Android] Add option to add additional files to built jars.

build/android/gyp/javac.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.
 
 import optparse
 import os
 import shutil
 import re
@@ skipping 211 matching lines @@
       # Make sure output exists.
       build_utils.Touch(pdb_path)
 
     glob = options.jar_excluded_classes
     inclusion_predicate = lambda f: not build_utils.MatchesGlob(f, glob)
     exclusion_predicate = lambda f: not inclusion_predicate(f)
 
     jar.JarDirectory(classes_dir,
                      options.jar_path,
                      predicate=inclusion_predicate,
-                     provider_configurations=options.provider_configurations)
+                     provider_configurations=options.provider_configurations,
+                     additional_files=options.additional_jar_files)
     jar.JarDirectory(classes_dir,
                      excluded_jar_path,
                      predicate=exclusion_predicate,
-                     provider_configurations=options.provider_configurations)
+                     provider_configurations=options.provider_configurations,
+                     additional_files=options.additional_jar_files)
 
 
 def _ParseOptions(argv):
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
 
   parser.add_option(
       '--src-gendirs',
       help='Directories containing generated java files.')
   parser.add_option(
@@ skipping 36 matching lines @@
       dest='processor_args',
       action='append',
       help='key=value arguments for the annotation processors.')
   parser.add_option(
       '--provider-configuration',
       dest='provider_configurations',
       action='append',
       help='File to specify a service provider. Will be included '
            'in the jar under META-INF/services.')
   parser.add_option(
+      '--additional-jar-file',
+      dest='additional_jar_files',
+      action='append',
+      help='Additional files to package into jar. By default, only Java .class '
+           'files are packaged into the jar. Files should be specified in '
+           'format <filename>:<path to be placed in jar>.')
+  parser.add_option(
       '--chromium-code',
       type='int',
       help='Whether code being compiled should be built with stricter '
       'warnings for chromium code.')
   parser.add_option(
       '--use-errorprone-path',
       help='Use the Errorprone compiler at this path.')
   parser.add_option('--jar-path', help='Jar output path.')
   parser.add_option('--stamp', help='Path to touch on success.')
 
   options, args = parser.parse_args(argv)
   build_utils.CheckOptions(options, parser, required=('jar_path',))
 
   bootclasspath = []
   for arg in options.bootclasspath:
     bootclasspath += build_utils.ParseGypList(arg)
   options.bootclasspath = bootclasspath
 
   classpath = []
   for arg in options.classpath:
     classpath += build_utils.ParseGypList(arg)
   options.classpath = classpath
 
   java_srcjars = []
   for arg in options.java_srcjars:
     java_srcjars += build_utils.ParseGypList(arg)
   options.java_srcjars = java_srcjars
 
+  additional_jar_files = []
+  if options.additional_jar_files:

[jbudorick, 2016/07/21 00:12:41]

optional nit: same

[mikecase (-- gone --), 2016/07/21 16:32:37]

ooh, I like this style. Done

+    for arg in options.additional_jar_files:
+      filepath, jar_filepath = arg.split(':')
+      additional_jar_files.append((filepath, jar_filepath))
+  options.additional_jar_files = additional_jar_files
+
   if options.src_gendirs:
     options.src_gendirs = build_utils.ParseGypList(options.src_gendirs)
 
   options.javac_includes = build_utils.ParseGypList(options.javac_includes)
   options.jar_excluded_classes = (
       build_utils.ParseGypList(options.jar_excluded_classes))
 
   java_files = []
   for arg in args:
     # Interpret a path prefixed with @ as a file containing a list of sources.
@@ skipping 87 matching lines @@
       options,
       input_paths=input_paths,
       input_strings=javac_cmd,
       output_paths=output_paths,
       force=force,
       pass_changes=True)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))