Pull buildtools to get GN r293190

build/config/BUILDCONFIG.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # =============================================================================
 # BUILD FLAGS
 # =============================================================================
 #
 # This block lists input arguments to the build, along with their default
 # values. GN requires listing them explicitly so it can validate input and have
@@ skipping 487 matching lines @@
 
 template("component") {
   if (is_component_build) {
     shared_library(target_name) {
       # Configs will always be defined since we set_defaults for a component
       # above. We want to use those rather than whatever came with the nested
       # shared/static library inside the 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 }
       if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
       if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
       if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
       if (defined(invoker.data)) { data = invoker.data }
       if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
       if (defined(invoker.defines)) { defines = invoker.defines }
       if (defined(invoker.deps)) { deps = invoker.deps }
       if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
       if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
       if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
       if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
       if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
       if (defined(invoker.libs)) { libs = invoker.libs }
       if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
       if (defined(invoker.output_name)) { output_name = invoker.output_name }
       if (defined(invoker.public)) { public = invoker.public }
       if (defined(invoker.sources)) { sources = invoker.sources }
       if (defined(invoker.visibility)) { visibility = invoker.visibility }
     }
   } else {
     source_set(target_name) {
       # See above.
       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 }
       if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
       if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
       if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
       if (defined(invoker.data)) { data = invoker.data }
       if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
       if (defined(invoker.defines)) { defines = invoker.defines }
       if (defined(invoker.deps)) { deps = invoker.deps }
@@ skipping 19 matching lines @@
 # Define a test as an executable. In the future, we'll set "test only" flags
 # on this (when such flags exist) and do something different for Android.
 template("test") {
   executable(target_name) {
     # Configs will always be defined since we set_defaults for a component
     # above. We want to use those rather than whatever came with the nested
     # shared/static library inside the 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 }
     if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
     if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
     if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
     if (defined(invoker.data)) { data = invoker.data }
     if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
     if (defined(invoker.defines)) { defines = invoker.defines }
     if (defined(invoker.deps)) { deps = invoker.deps }
     if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
     if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
     if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
     if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
     if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
     if (defined(invoker.libs)) { libs = invoker.libs }
     if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
     if (defined(invoker.output_name)) { output_name = invoker.output_name }
     if (defined(invoker.public)) { public = invoker.public }
     if (defined(invoker.sources)) { sources = invoker.sources }
     if (defined(invoker.visibility)) { visibility = invoker.visibility }
   }
 }