Pull buildtools to get GN r293190

build/config/BUILDCONFIG.gn

Index: build/config/BUILDCONFIG.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 5721a9bbb025dc8d49de1e1b14c1e239b13e7b49..6354aec651dd0e4039f12511cb3e2aa8d927b984 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 }