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

build/config/android/internal_rules.gni

 # Copyright 2014 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("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
 # These identify targets that have .build_config files (except for android_apk,
@@ skipping 1812 matching lines @@
 
     _provider_configurations = []
     if (defined(invoker.provider_configurations)) {
       _provider_configurations = invoker.provider_configurations
     }
 
     _processors = []
     _enable_interface_jars_javac = true
     if (defined(invoker.processors_javac)) {
       _processors = invoker.processors_javac
-      _enable_iterface_jars_javac = _processors == []
+      _enable_interface_jars_javac = _processors == []
     }
 
     _processor_args = []
     if (defined(invoker.processor_args_javac)) {
       _processor_args = invoker.processor_args_javac
     }
 
+    _additional_jar_files = []
+    if (defined(invoker.additional_jar_files)) {
+      _additional_jar_files = invoker.additional_jar_files
+    }
+
     if (defined(invoker.enable_incremental_javac_override)) {
       # Use invoker-specified override.
       _enable_incremental_javac = invoker.enable_incremental_javac_override
     } else {
       # Default to build arg if not overridden.
       _enable_incremental_javac = enable_incremental_javac
     }
 
     _manifest_entries = []
     if (defined(invoker.manifest_entries)) {
@@ skipping 112 matching lines @@
       }
       foreach(e, _provider_configurations) {
         args += [ "--provider-configuration=" + rebase_path(e, root_build_dir) ]
       }
       foreach(e, _processors) {
         args += [ "--processor=" + e ]
       }
       foreach(e, _processor_args) {
         args += [ "--processor-arg=" + e ]
       }
+      foreach(e, _additional_jar_files) {
+        args += [ "--additional-jar-file=" + e ]
+      }
       if (invoker.java_files != []) {
         args += [ "@" + rebase_path(invoker.java_sources_file, root_build_dir) ]
       }
     }
 
     process_java_prebuilt(_process_prebuilt_target_name) {
       forward_variables_from(invoker, [ "jar_excluded_patterns" ])
       build_config = _build_config
       input_jar_path = _javac_jar_path
       output_jar_path = _process_prebuilt_jar_path
@@ skipping 188 matching lines @@
       _srcjars = invoker.srcjars
     }
 
     assert(_java_files != [] || _srcjar_deps != [] || _srcjars != [])
 
     _compile_java_target = "${_template_name}__compile_java"
     _final_deps += [ ":$_compile_java_target" ]
     compile_java(_compile_java_target) {
       forward_variables_from(invoker,
                              [
+                               "additional_jar_files",
                                "alternative_android_sdk_ijar",
                                "alternative_android_sdk_ijar_dep",
                                "dist_jar_path",
                                "enable_errorprone",
                                "enable_incremental_javac_override",
                                "input_jars_paths",
                                "jar_excluded_patterns",
                                "manifest_entries",
                                "processors_javac",
                                "processor_args_javac",
@@ skipping 330 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }