Roll base to ec59756cc1ad02cc835bcca10056a621c9eb346c.

build/config/android/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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ skipping 867 matching lines @@
     if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     }
     if (defined(invoker.chromium_code)) {
       chromium_code = invoker.chromium_code
     }
     deps = [
       "//testing/android/junit:junit_test_support",
       "//third_party/junit",
       "//third_party/mockito:mockito_java",
+      "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
       "//third_party/robolectric:robolectric_java",
-      "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     }
     if (defined(invoker.srcjar_deps)) {
       srcjar_deps = invoker.srcjar_deps
     }
@@ skipping 115 matching lines @@
 #   java_prebuilt("foo_java") {
 #     jar_path = "foo.jar"
 #     deps = [
 #       ":foo_resources",
 #       ":bar_java"
 #     ]
 #   }
 template("java_prebuilt") {
   set_sources_assignment_filter([])
   java_prebuilt_impl(target_name) {
-    jar_path = invoker.jar_path
-    if (defined(invoker.testonly)) {
-      testonly = invoker.testonly
-    }
-    if (defined(invoker.deps)) {
-      deps = invoker.deps
-    }
-    if (defined(invoker.proguard_config)) {
-      proguard_config = invoker.proguard_config
-    }
-    if (defined(invoker.proguard_preprocess)) {
-      proguard_preprocess = invoker.proguard_preprocess
-    }
+    forward_variables_from(invoker, "*")
   }
 }
 
 # Declare an Android library target
 #
 # This target creates an Android library containing java code and Android
 # resources.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
@@ skipping 564 matching lines @@
 
     version_code = _version_code
     version_name = _version_name
 
     keystore_name = _keystore_name
     keystore_path = _keystore_path
     keystore_password = _keystore_password
 
     # This target generates the input file _all_resources_zip_path.
     deps = [
+      ":$final_dex_target_name",
       ":$process_resources_target",
-      ":$final_dex_target_name",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
     if (defined(invoker.asset_location)) {
       asset_location = invoker.asset_location
 
       # We don't know the exact dependencies that create the assets in
       # |asset_location|; we depend on all caller deps until a better solution
@@ skipping 480 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }