diff options
| author | Alex Mineer <amineer@google.com> | 2015-06-22 08:39:39 -0700 |
|---|---|---|
| committer | Alex Mineer <amineer@google.com> | 2015-06-22 15:40:36 +0000 |
| commit | 8a673e024a78dc375ef34ccd2e32c903f8c67e68 (patch) | |
| tree | cc5141cdb97c8878c67328b771448af763cf14a1 | |
| parent | ac161245b7970433a6b055d1baaef73061a15155 (diff) | |
| download | chromium_src-8a673e024a78dc375ef34ccd2e32c903f8c67e68.zip chromium_src-8a673e024a78dc375ef34ccd2e32c903f8c67e68.tar.gz chromium_src-8a673e024a78dc375ef34ccd2e32c903f8c67e68.tar.bz2 | |
Revert "Reland "Roll buildtools fa660d47..ecc8e253""
This reverts commit 55c615dc327046f24354b815e1edc795ed52bccb.
Cr-Commit-Position: refs/branch-heads/2438@{#4}
Cr-Branched-From: 674a266831501f840425eb864141feb600aeb5ee-refs/heads/master@{#335429}
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/config/android/rules.gni | 6 | ||||
| -rw-r--r-- | chrome/android/BUILD.gn | 4 |
3 files changed, 1 insertions, 11 deletions
@@ -50,7 +50,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling build tools # and whatever else without interference from each other. - 'buildtools_revision': 'ecc8e253abac3b6186a97573871a084f4c0ca3ae', + 'buildtools_revision': 'fa660d47fa1a6c649d5c29e001348447c55709e6', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index 57af185..96cbe44 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -554,8 +554,6 @@ template("jinja_template_resources") { # 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") { @@ -593,10 +591,6 @@ template("locale_pak_resources") { "--depfile", rebase_path(depfile, root_build_dir), ] - - if (defined(invoker.deps)) { - deps = invoker.deps - } } group(target_name) { diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 8e00007..e820241 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -35,10 +35,6 @@ 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) |