Index: tools/gn/builder.cc |
diff --git a/tools/gn/builder.cc b/tools/gn/builder.cc |
index 45c6926d26fa723c104bd576af309dc29b83a234..fbd4d572a08b04184581f0960b6f57c8718f67de 100644 |
--- a/tools/gn/builder.cc |
+++ b/tools/gn/builder.cc |
@@ -88,6 +88,9 @@ void Builder::ItemDefined(scoped_ptr<Item> item) { |
case BuilderRecord::ITEM_TARGET: |
TargetDefined(record, &err); |
break; |
+ case BuilderRecord::ITEM_CONFIG: |
+ ConfigDefined(record, &err); |
+ break; |
case BuilderRecord::ITEM_TOOLCHAIN: |
ToolchainDefined(record, &err); |
break; |
@@ -233,6 +236,13 @@ bool Builder::TargetDefined(BuilderRecord* record, Err* err) { |
return true; |
} |
+bool Builder::ConfigDefined(BuilderRecord* record, Err* err) { |
+ Config* config = record->item()->AsConfig(); |
+ if (!AddDeps(record, config->configs(), err)) |
+ return false; |
+ return true; |
+} |
+ |
bool Builder::ToolchainDefined(BuilderRecord* record, Err* err) { |
Toolchain* toolchain = record->item()->AsToolchain(); |
@@ -398,6 +408,10 @@ bool Builder::ResolveItem(BuilderRecord* record, Err* err) { |
!ResolveForwardDependentConfigs(target, err) || |
!ResolveToolchain(target, err)) |
return false; |
+ } else if (record->type() == BuilderRecord::ITEM_CONFIG) { |
+ Config* config = record->item()->AsConfig(); |
+ if (!ResolveConfigs(&config->configs(), err)) |
+ return false; |
} else if (record->type() == BuilderRecord::ITEM_TOOLCHAIN) { |
Toolchain* toolchain = record->item()->AsToolchain(); |
if (!ResolveDeps(&toolchain->deps(), err)) |