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

build/android/gyp/jar.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 sys
 
 from util import build_utils
 
 
 _RESOURCE_CLASSES = [
     "R.class",
     "R##*.class",
     "Manifest.class",
     "Manifest##*.class",
 ]
 
 
 def Jar(class_files, classes_dir, jar_path, manifest_file=None,
-        provider_configurations=None):
+        provider_configurations=None, additional_files=None):
   jar_path = os.path.abspath(jar_path)
 
   # The paths of the files in the jar will be the same as they are passed in to
   # the command. Because of this, the command should be run in
   # options.classes_dir so the .class file paths in the jar are correct.
   jar_cwd = classes_dir
   class_files_rel = [os.path.relpath(f, jar_cwd) for f in class_files]
   jar_cmd = ['jar', 'cf0', jar_path]
   if manifest_file:
     jar_cmd[1] += 'm'
     jar_cmd.append(os.path.abspath(manifest_file))
   jar_cmd.extend(class_files_rel)
 
+  if additional_files:

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

optional nit: you could eliminate this by doing

  for filepath, jar_filepath in additional_files or []:

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

oooh, I like this style. Done

+    for filepath, jar_filepath in additional_files:
+      full_jar_filepath = os.path.join(jar_cwd, jar_filepath)
+      jar_dir = os.path.dirname(full_jar_filepath)
+      if not os.path.exists(jar_dir):
+        os.makedirs(jar_dir)
+      shutil.copy(filepath, full_jar_filepath)
+      jar_cmd.append(jar_filepath)
+
   if provider_configurations:
     service_dir = os.path.join(jar_cwd, 'META-INF', 'services')
     if not os.path.exists(service_dir):
       os.makedirs(service_dir)
     for config in provider_configurations:
       config_jar_path = os.path.join(service_dir, os.path.basename(config))
       shutil.copy(config, config_jar_path)
       jar_cmd.append(os.path.relpath(config_jar_path, jar_cwd))
 
   if not class_files_rel:
     empty_file = os.path.join(classes_dir, '.empty')
     build_utils.Touch(empty_file)
     jar_cmd.append(os.path.relpath(empty_file, jar_cwd))
   build_utils.CheckOutput(jar_cmd, cwd=jar_cwd)
   build_utils.Touch(jar_path, fail_if_missing=True)
 
 
 def JarDirectory(classes_dir, jar_path, manifest_file=None, predicate=None,
-                 provider_configurations=None):
+                 provider_configurations=None, additional_files=None):
   class_files = build_utils.FindInDirectory(classes_dir, '*.class')
   if predicate:
     class_files = [f for f in class_files if predicate(f)]
 
   Jar(class_files, classes_dir, jar_path, manifest_file=manifest_file,
-      provider_configurations=provider_configurations)
+      provider_configurations=provider_configurations,
+      additional_files=additional_files)
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('--classes-dir', help='Directory containing .class files.')
   parser.add_option('--input-jar', help='Jar to include .class files from')
   parser.add_option('--jar-path', help='Jar output path.')
   parser.add_option('--excluded-classes',
       help='GYP list of .class file patterns to exclude from the jar.')
   parser.add_option('--strip-resource-classes-for',
@@ skipping 25 matching lines @@
       classes_dir = temp_dir
     JarDirectory(classes_dir, options.jar_path, predicate=predicate)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main())