Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: tools/gn/builder.cc

Issue 1342183003: Allow GN configs to have sub-configs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/builder.h ('k') | tools/gn/command_desc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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))
« no previous file with comments | « tools/gn/builder.h ('k') | tools/gn/command_desc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698