| Index: build/config/BUILDCONFIG.gn
 | 
| diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 | 
| index c8e8d9ec7d514af8512d7e0e679b268e748cc0c7..78f64e8e1d6b060dd478d0bcb9d488c3a1fa8783 100644
 | 
| --- a/build/config/BUILDCONFIG.gn
 | 
| +++ b/build/config/BUILDCONFIG.gn
 | 
| @@ -511,11 +511,13 @@ template("component") {
 | 
|        set_sources_assignment_filter([])
 | 
|  
 | 
|        if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
 | 
| +      if (defined(invoker.allow_circular_includes_from)) { allow_circular_includes_from = invoker.allow_circular_includes_from }
 | 
|        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.check_includes)) { check_includes = invoker.check_includes }
 | 
|        if (defined(invoker.data)) { data = invoker.data }
 | 
|        if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
 | 
|        if (defined(invoker.defines)) { defines = invoker.defines }
 | 
| @@ -530,6 +532,7 @@ template("component") {
 | 
|        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.testonly)) { testonly = invoker.testonly }
 | 
|        if (defined(invoker.visibility)) { visibility = invoker.visibility }
 | 
|      }
 | 
|    } else {
 | 
| @@ -542,11 +545,13 @@ template("component") {
 | 
|        set_sources_assignment_filter([])
 | 
|  
 | 
|        if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
 | 
| +      if (defined(invoker.allow_circular_includes_from)) { allow_circular_includes_from = invoker.allow_circular_includes_from }
 | 
|        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.check_includes)) { check_includes = invoker.check_includes }
 | 
|        if (defined(invoker.data)) { data = invoker.data }
 | 
|        if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
 | 
|        if (defined(invoker.defines)) { defines = invoker.defines }
 | 
| @@ -561,6 +566,7 @@ template("component") {
 | 
|        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.testonly)) { testonly = invoker.testonly }
 | 
|        if (defined(invoker.visibility)) { visibility = invoker.visibility }
 | 
|      }
 | 
|    }
 | 
| @@ -586,11 +592,13 @@ template("test") {
 | 
|      set_sources_assignment_filter([])
 | 
|  
 | 
|      if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
 | 
| +    if (defined(invoker.allow_circular_includes_from)) { allow_circular_includes_from = invoker.allow_circular_includes_from }
 | 
|      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.check_includes)) { check_includes = invoker.check_includes }
 | 
|      if (defined(invoker.data)) { data = invoker.data }
 | 
|      if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
 | 
|      if (defined(invoker.defines)) { defines = invoker.defines }
 | 
| 
 |