diff options
| author | brettw <brettw@chromium.org> | 2014-09-03 23:01:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 06:03:34 +0000 |
| commit | babd228391d379b59d5f60befb76ce0640aad90e (patch) | |
| tree | 8a15f0ac762287a31cc1ba89489a45af7d64b8ee | |
| parent | 1466fb3f7eeb48a721510829230ca2255e05cb22 (diff) | |
| download | chromium_src-babd228391d379b59d5f60befb76ce0640aad90e.zip chromium_src-babd228391d379b59d5f60befb76ce0640aad90e.tar.gz chromium_src-babd228391d379b59d5f60befb76ce0640aad90e.tar.bz2 | |
Pull buildtools to get GN r293190
TBR=jamesr
Review URL: https://codereview.chromium.org/535173003
Cr-Commit-Position: refs/heads/master@{#293269}
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/config/BUILDCONFIG.gn | 11 |
2 files changed, 12 insertions, 1 deletions
@@ -58,7 +58,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': '2328da46142d2abb4fbe08a6ac056f50e6df0e61', + 'buildtools_revision': 'ea4dc0e322f4c4c3784ace03b47de99184c4cb55', # 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/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index 5721a9b..6354aec 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -505,6 +505,11 @@ template("component") { configs = [] # Prevent list overwriting warning. configs = invoker.configs + # The sources assignment filter will have already been applied when the + # code was originally executed. We don't want to apply it again, since + # the original target may have override it for some assignments. + set_sources_assignment_filter([]) + if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs } if (defined(invoker.cflags)) { cflags = invoker.cflags } if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c } @@ -533,6 +538,9 @@ template("component") { configs = [] # Prevent list overwriting warning. configs = invoker.configs + # See above call. + set_sources_assignment_filter([]) + if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs } if (defined(invoker.cflags)) { cflags = invoker.cflags } if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c } @@ -572,6 +580,9 @@ template("test") { configs = [] # Prevent list overwriting warning. configs = invoker.configs + # See above call. + set_sources_assignment_filter([]) + if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs } if (defined(invoker.cflags)) { cflags = invoker.cflags } if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c } |