Commit babd2283 authored by brettw's avatar brettw Committed by Commit bot

Pull buildtools to get GN r293190

TBR=jamesr

Review URL: https://codereview.chromium.org/535173003

Cr-Commit-Position: refs/heads/master@{#293269}
parent 1466fb3f
......@@ -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.
......
......@@ -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 }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment