Allow GN configs to have sub-configs.

tools/gn/builder.cc

 // 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.
 
 #include "tools/gn/builder.h"
 
 #include "tools/gn/config.h"
 #include "tools/gn/deps_iterator.h"
 #include "tools/gn/err.h"
 #include "tools/gn/loader.h"
@@ skipping 70 matching lines @@
   }
 
   record->set_item(item.Pass());
 
   // Do target-specific dependency setup. This will also schedule dependency
   // loads for targets that are required.
   switch (type) {
     case BuilderRecord::ITEM_TARGET:
       TargetDefined(record, &err);
       break;
+    case BuilderRecord::ITEM_CONFIG:
+      ConfigDefined(record, &err);
+      break;
     case BuilderRecord::ITEM_TOOLCHAIN:
       ToolchainDefined(record, &err);
       break;
     default:
       break;
   }
   if (err.has_error()) {
     g_scheduler->FailWithError(err);
     return;
   }
@@ skipping 125 matching lines @@
   // All targets in the default toolchain get generated by default. We also
   // check if this target was previously marked as "required" and force setting
   // the bit again so the target's dependencies (which we now know) get the
   // required bit pushed to them.
   if (record->should_generate() || target->settings()->is_default())
     RecursiveSetShouldGenerate(record, true);
 
   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();
 
   if (!AddDeps(record, toolchain->deps(), err))
     return false;
 
   // The default toolchain gets generated by default. Also propogate the
   // generate flag if it depends on items in a non-default toolchain.
   if (record->should_generate() ||
       toolchain->settings()->default_toolchain_label() == toolchain->label())
@@ skipping 145 matching lines @@
     Target* target = record->item()->AsTarget();
     if (!ResolveDeps(&target->public_deps(), err) ||
         !ResolveDeps(&target->private_deps(), err) ||
         !ResolveDeps(&target->data_deps(), err) ||
         !ResolveConfigs(&target->configs(), err) ||
         !ResolveConfigs(&target->all_dependent_configs(), err) ||
         !ResolveConfigs(&target->public_configs(), 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))
       return false;
   }
 
   record->set_resolved(true);
 
   if (!record->item()->OnResolved(err))
     return false;
@@ skipping 99 matching lines @@
   std::string ret;
   for (size_t i = 0; i < cycle.size(); i++) {
     ret += "  " + cycle[i]->label().GetUserVisibleName(false);
     if (i != cycle.size() - 1)
       ret += " ->";
     ret += "\n";
   }
 
   return ret;
 }