Add public deps to GN

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/err.h"
 #include "tools/gn/loader.h"
 #include "tools/gn/scheduler.h"
@@ skipping 208 matching lines @@
     }
     return false;
   }
 
   return true;
 }
 
 bool Builder::TargetDefined(BuilderRecord* record, Err* err) {
   Target* target = record->item()->AsTarget();
 
-  if (!AddDeps(record, target->deps(), err) ||
-      !AddDeps(record, target->datadeps(), err) ||
+  if (!AddDeps(record, target->public_deps(), err) ||
+      !AddDeps(record, target->private_deps(), err) ||
+      !AddDeps(record, target->data_deps(), err) ||
       !AddDeps(record, target->configs().vector(), err) ||
       !AddDeps(record, target->all_dependent_configs(), err) ||
-      !AddDeps(record, target->direct_dependent_configs(), err) ||
+      !AddDeps(record, target->public_configs(), err) ||
       !AddToolchainDep(record, target, err))
     return false;
 
   // 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);
 
@@ skipping 152 matching lines @@
   const ParseNode* origin = record->originally_referenced_from();
   loader_->Load(record->label(),
                 origin ? origin->GetRange() : LocationRange());
 }
 
 bool Builder::ResolveItem(BuilderRecord* record, Err* err) {
   DCHECK(record->can_resolve() && !record->resolved());
 
   if (record->type() == BuilderRecord::ITEM_TARGET) {
     Target* target = record->item()->AsTarget();
-    if (!ResolveDeps(&target->deps(), err) ||
-        !ResolveDeps(&target->datadeps(), err) ||
+    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->direct_dependent_configs(), err) ||
+        !ResolveConfigs(&target->public_configs(), err) ||
         !ResolveForwardDependentConfigs(target, err) ||
         !ResolveToolchain(target, 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);
@@ skipping 45 matching lines @@
     if (!record)
       return false;
     const_cast<LabelConfigPair&>(cur).ptr = record->item()->AsConfig();
   }
   return true;
 }
 
 // "Forward dependent configs" should refer to targets in the deps that should
 // have their configs forwarded.
 bool Builder::ResolveForwardDependentConfigs(Target* target, Err* err) {
-  const LabelTargetVector& deps = target->deps();
   const UniqueVector<LabelTargetPair>& configs =
       target->forward_dependent_configs();
 
   // Assume that the lists are small so that brute-force n^2 is appropriate.
   for (size_t config_i = 0; config_i < configs.size(); config_i++) {
-    for (size_t dep_i = 0; dep_i < deps.size(); dep_i++) {
-      if (configs[config_i].label == deps[dep_i].label) {
-        DCHECK(deps[dep_i].ptr);  // Should already be resolved.
+    for (DepsIterator dep_iter(target, DepsIterator::LINKED_ONLY);
+         !dep_iter.done(); dep_iter.Advance()) {
+      if (configs[config_i].label == dep_iter.label()) {
+        DCHECK(dep_iter.target());  // Should already be resolved.
         // UniqueVector's contents are constant so uniqueness is preserved, but
         // we want to update this pointer which doesn't change uniqueness
         // (uniqueness in this vector is determined by the label only).
-        const_cast<LabelTargetPair&>(configs[config_i]).ptr = deps[dep_i].ptr;
+        const_cast<LabelTargetPair&>(configs[config_i]).ptr = dep_iter.target();
         break;
       }
     }
     if (!configs[config_i].ptr) {
       *err = Err(target->defined_from(),
           "Target in forward_dependent_configs_from was not listed in the deps",
           "This target has a forward_dependent_configs_from entry that was "
           "not present in\nthe deps. A target can only forward things it "
           "depends on. It was forwarding:\n  " +
           configs[config_i].label.GetUserVisibleName(false));
@@ skipping 30 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;
 }