Change in android Java build rules for Mojo Java content handler

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")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
@@ skipping 647 matching lines @@
 
   _jar_excluded_patterns = []
   if (defined(invoker.jar_excluded_patterns)) {
     _jar_excluded_patterns += invoker.jar_excluded_patterns
   }
 
   _chromium_code = false
   if (defined(invoker.chromium_code)) {
     _chromium_code = invoker.chromium_code
   }
+  _manifest_entries = []
+  if (defined(invoker.manifest_entries)) {
+    _manifest_entries = invoker.manifest_entries
+  }
 
   _srcjar_deps = []
   if (defined(invoker.srcjar_deps)) {
     _srcjar_deps += invoker.srcjar_deps
   }
 
   _java_srcjars = []
   if (defined(invoker.srcjars)) {
     _java_srcjars = invoker.srcjars
   }
@@ skipping 33 matching lines @@
     _rebased_depfile = rebase_path(depfile, root_build_dir)
     args = [
       "--depfile=$_rebased_depfile",
       "--classpath=$_rebased_system_jars",
       "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
       "--jar-path=$_rebased_jar_path",
       "--java-srcjars=$_rebased_java_srcjars",
       "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
       "--jar-excluded-classes=$_jar_excluded_patterns",
     ]
+    foreach(e, _manifest_entries) {
+      args += [ "--manifest-entry=" + e ]
+    }
     if (_chromium_code) {
       args += [ "--chromium-code=1" ]
     }
 
     args += rebase_path(_java_files, root_build_dir)
   }
 
   _final_deps += [ ":${_template_name}__finish" ]
   process_java_prebuilt("${_template_name}__finish") {
     build_config = _build_config
@@ skipping 123 matching lines @@
     }
     if (defined(invoker.proguard_preprocess)) {
       proguard_preprocess = invoker.proguard_preprocess
     }
     if (defined(invoker.proguard_config)) {
       proguard_config = invoker.proguard_config
     }
     if (defined(invoker.dist_jar_path)) {
       dist_jar_path = invoker.dist_jar_path
     }
+    if (defined(invoker.manifest_entries)) {
+      manifest_entries = invoker.manifest_entries
+    }
   }
 
   if (defined(invoker.main_class)) {
     _final_deps += [ ":${_template_name}__binary_script" ]
     action("${_template_name}__binary_script") {
       script = "//build/android/gyp/create_java_binary_script.py"
       depfile = "$target_gen_dir/$target_name.d"
       java_script = "$root_build_dir/bin/$_template_name"
       inputs = [
         _build_config,
@@ skipping 204 matching lines @@
   rebased_build_config = rebase_path(build_config, root_build_dir)
   dex(target_name) {
     inputs = [
       build_config,
     ]
     output = invoker.dex_path
     dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files"
     args = [ "--inputs=@FileArg($dex_arg_key)" ]
   }
 }