Roll internal Google Play Services (Chromium part)

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)
 
 # Write the target's .build_config file. This is a json file that contains a
@@ skipping 535 matching lines @@
                                "public_deps",
                                "testonly",
                              ])
       script = "//build/android/gyp/proguard.py"
       if (defined(invoker.proguard_jar_path)) {
         _proguard_jar_path = invoker.proguard_jar_path
       } else {
         _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,
       ]
       if (defined(invoker.alternative_android_sdk_jar)) {
         inputs += [ invoker.alternative_android_sdk_jar ]
         _rebased_android_sdk_jar =
             rebase_path(invoker.alternative_android_sdk_jar)
       } else {
         inputs += [ android_sdk_jar ]
         _rebased_android_sdk_jar = rebased_android_sdk_jar
@@ skipping 13 matching lines @@
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--proguard-path",
         rebase_path(_proguard_jar_path, root_build_dir),
         "--output-path",
         rebase_path(_output_jar_path, root_build_dir),
         "--classpath",
         _rebased_android_sdk_jar,
       ]
+      foreach(c, _input_jars_paths) {
+        args += [ "--classpath=" + c ]
+      }
       if (proguard_verbose) {
         args += [ "--verbose" ]
       }
       if (defined(invoker.args)) {
         args += invoker.args
       }
     }
   }
 
   template("findbugs") {
@@ skipping 203 matching lines @@
       }
 
       if (defined(invoker.sources)) {
         args += rebase_path(invoker.sources, root_build_dir)
       }
     }
   }
 
   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
     _rebased_build_config = rebase_path(_build_config, root_build_dir)
     assert(_rebased_build_config != "" || true)  # Mark used.
 
     _proguard_preprocess =
         defined(invoker.proguard_preprocess) && invoker.proguard_preprocess
     _input_jar_path = invoker.input_jar_path
     _output_jar_path = invoker.output_jar_path
@@ skipping 774 matching lines @@
       if (_supports_android) {
         dex_path = _dex_path
       }
     }
 
     process_java_prebuilt(_process_jar_target_name) {
       forward_variables_from(invoker,
                              [
                                "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",
       ]
       if (_supports_android) {
         visibility += [ ":$_dex_target_name" ]
       }
 
       if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
         proguard_preprocess = true
@@ skipping 762 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }