Roll internal Google Play Services (Chromium part)

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 0b9fa9d12400a017bf48db6fb98a71dcf85ddcb0..ddc9c362b4c1158b2dc6652a6d07fe365c1d9e8b 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -545,6 +545,10 @@ if (enable_java_templates) {
         _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
       }
       _output_jar_path = invoker.output_jar_path
+      _input_jars_paths = []
+      if (defined(invoker.input_jars_paths)) {
+        _input_jars_paths += invoker.input_jars_paths
+      }
       inputs = [
         _proguard_jar_path,
       ]
@@ -578,6 +582,9 @@ if (enable_java_templates) {
         "--classpath",
         _rebased_android_sdk_jar,
       ]
+      foreach(c, _input_jars_paths) {
+        args += [ "--classpath=" + c ]
+      }
       if (proguard_verbose) {
         args += [ "--verbose" ]
       }
@@ -801,7 +808,12 @@ if (enable_java_templates) {
 
   template("process_java_prebuilt") {
     set_sources_assignment_filter([])
-    forward_variables_from(invoker, [ "testonly" ])
+    forward_variables_from(invoker,
+                           [
+                             "testonly",
+                             "input_jars_paths",
+                           ])
+    assert(!defined(input_jars_paths) || input_jars_paths != [] || true)  # Mark as used
 
     assert(invoker.build_config != "")
     _build_config = invoker.build_config
@@ -1596,7 +1608,10 @@ if (enable_java_templates) {
                              [
                                "jar_excluded_patterns",
                                "strip_resource_classes",
+                               "input_jars_paths",
                              ])
+      assert(!defined(input_jars_paths) || input_jars_paths != [] || true)  # Mark as used
+
       visibility = [
         ":$_ijar_target_name",
         ":$_template_name",