From 55c615dc327046f24354b815e1edc795ed52bccb Mon Sep 17 00:00:00 2001 From: dpranke Date: Fri, 19 Jun 2015 18:19:49 -0700 Subject: [PATCH] Reland "Roll buildtools fa660d47..ecc8e253" Original issue's description: > Roll buildtools fa660d47..ecc8e253 > > https://chromium.googlesource.com/chromium/buildtools/+log/fa660d47..ecc8e253 > > ecc8e25 Roll GN #330790:#333203 (9d04333f..4e3e57b2) > 46ce8cb Optionally support relative include paths in cpp_checker.py > b983eee Fix the .gitignore rules to complain about linux32 if need be. > > The GN roll contains the following changes to tools/gn: > > https://chromium.googlesource.com/chromium/src.git/+log/9d04333f..4e3e57b2/tools/gn > > 56affab Check for inputs not generated by deps > e903c0f Allow directories for GN data lists. > ff0986f GN: Make file/dir resolving return errors. > b73b2de Add support for module-definition files to gn > 58a1b33 Add base/files/file_tracing.cc to tools/gn/bootstrap/bootstrap.py. > 92acc5e gn: Add a newline to fix a bulleted list in README.md. > 81d969a Fix missing print command in a GN error case. > a9adafe Make GN header checker more lenient about toolchains. > > In addition, the Linux build of GN was the first build with > use_ozone=true use_glib=false in order to not have a runtime The roll was reverted because #335350 introduced a new target in //chrome/android that had some missing deps. This attempt at the roll includes a fix for that. TBR=brettw@chromium.org, agrieve@chromium.org CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_dbg,mac_chromium_gn_rel;tryserver.chromium.win:win8_chromium_gn_dbg;tryserver.chromium.linux:linux_chromium_gn_chromeos_dbg Review URL: https://codereview.chromium.org/1198693002 Cr-Commit-Position: refs/heads/master@{#335412} --- DEPS | 2 +- build/config/android/rules.gni | 6 ++++++ chrome/android/BUILD.gn | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 6f9d35c5a476..5d118a6bcca4 100644 --- a/DEPS +++ b/DEPS @@ -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': 'fa660d47fa1a6c649d5c29e001348447c55709e6', + 'buildtools_revision': 'ecc8e253abac3b6186a97573871a084f4c0ca3ae', # 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 96cbe44f1ca6..57af185bf57b 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -554,6 +554,8 @@ 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") { @@ -591,6 +593,10 @@ 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 e820241da9b4..8e000079d277 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -35,6 +35,10 @@ 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) -- 2.11.4.GIT