Reland "Roll buildtools fa660d47..ecc8e253"

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 536 matching lines @@
 # Creates a resources.zip with locale.pak files placed into appropriate
 # resource configs (e.g. en-GB.pak -> res/raw-en/en_gb.pak). Also generates
 # a locale_paks TypedArray so that resource files can be enumerated at runtime.
 #
 # If this target is included in the deps of an android resources/library/apk,
 # the resources will be included with that target.
 #
 # Variables:
 #   sources: List of .pak files. Names must be of the form "en.pak" or
 #       "en-US.pak".
+#   deps: (optional) List of dependencies that might be needed to generate
+#       the .pak files.
 #
 # Example
 #   locale_pak_resources("locale_paks") {
 #     sources = [ "path/en-US.pak", "path/fr.pak", ... ]
 #   }
 template("locale_pak_resources") {
   set_sources_assignment_filter([])
   assert(defined(invoker.sources))
 
   _base_path = "$target_gen_dir/$target_name"
@@ skipping 17 matching lines @@
     ]
 
     _rebased_sources = rebase_path(invoker.sources, root_build_dir)
     args = [
       "--locale-paks=${_rebased_sources}",
       "--resources-zip",
       rebase_path(_resources_zip, root_build_dir),
       "--depfile",
       rebase_path(depfile, root_build_dir),
     ]
+
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
   }
 
   group(target_name) {
     deps = [
       ":${target_name}__build_config",
       ":${target_name}__create_resources_zip",
     ]
   }
 }
 
@@ skipping 1572 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) {
   }
 }