Reland "Roll buildtools fa660d47..ecc8e253"

chrome/android/BUILD.gn

 # 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/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 17 matching lines @@
     exec_script("//build/gypi_to_gn.py",
                 [
                   rebase_path("//chrome/chrome_android_paks.gypi"),
                   "--replace=<(PRODUCT_DIR)=$root_out_dir",
                 ],
                 "scope",
                 [ "//chrome/chrome_android_paks.gypi" ])
 
 locale_pak_resources("chrome_locale_paks") {
   sources = chrome_android_paks_gypi.chrome_android_pak_locale_resources
+
+  deps = [
+    "//chrome:packed_resources",
+  ]
 }
 
 # GYP: //chrome/chrome.gyp:chrome_java (resources part)
 android_resources("chrome_java_resources") {
   resource_dirs = [
     "java/res",
     "java/res_default",
   ]
   deps = [
     ":chrome_locale_paks",
@@ skipping 791 matching lines @@
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     ":chrome_public_test_apk_manifest",
     "//chrome/test/android:chrome_staging_test_support_java",
     "//chrome/android:chrome_staging_test_java",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
 }