Add public deps to GN

tools/gn/ninja_binary_target_writer.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/ninja_binary_target_writer.h"
 
 #include <set>
 
 #include "base/strings/string_util.h"
 #include "tools/gn/config_values_extractors.h"
+#include "tools/gn/deps_iterator.h"
 #include "tools/gn/err.h"
 #include "tools/gn/escape.h"
 #include "tools/gn/ninja_utils.h"
 #include "tools/gn/settings.h"
 #include "tools/gn/string_utils.h"
 #include "tools/gn/substitution_writer.h"
 #include "tools/gn/target.h"
 
 namespace {
 
@@ skipping 338 matching lines @@
   for (size_t i = 0; i < non_linkable_deps.size(); i++)
     order_only_deps.push_back(non_linkable_deps[i]->dependency_output_file());
 
   WriteStampForTarget(object_files, order_only_deps);
 }
 
 void NinjaBinaryTargetWriter::GetDeps(
     UniqueVector<OutputFile>* extra_object_files,
     UniqueVector<const Target*>* linkable_deps,
     UniqueVector<const Target*>* non_linkable_deps) const {
-  const LabelTargetVector& deps = target_->deps();
   const UniqueVector<const Target*>& inherited =
       target_->inherited_libraries();
 
-  // Normal deps.
-  for (size_t i = 0; i < deps.size(); i++) {
-    ClassifyDependency(deps[i].ptr, extra_object_files,
+  // Normal public/private deps.
+  for (DepsIterator iter(target_, DepsIterator::LINKED_ONLY); !iter.done();
+       iter.Advance()) {
+    ClassifyDependency(iter.target(), extra_object_files,
                        linkable_deps, non_linkable_deps);
   }
 
   // Inherited libraries.
   for (size_t i = 0; i < inherited.size(); i++) {
     ClassifyDependency(inherited[i], extra_object_files,
                        linkable_deps, non_linkable_deps);
   }
 
   // Data deps.
-  const LabelTargetVector& datadeps = target_->datadeps();
-  for (size_t i = 0; i < datadeps.size(); i++)
-    non_linkable_deps->push_back(datadeps[i].ptr);
+  const LabelTargetVector& data_deps = target_->data_deps();
+  for (size_t i = 0; i < data_deps.size(); i++)
+    non_linkable_deps->push_back(data_deps[i].ptr);
 }
 
 void NinjaBinaryTargetWriter::ClassifyDependency(
     const Target* dep,
     UniqueVector<OutputFile>* extra_object_files,
     UniqueVector<const Target*>* linkable_deps,
     UniqueVector<const Target*>* non_linkable_deps) const {
   // Only the following types of outputs have libraries linked into them:
   //  EXECUTABLE
   //  SHARED_LIBRARY
@@ skipping 69 matching lines @@
     return false;  // No tool for this file (it's a header file or something).
   const Tool* tool = target->toolchain()->GetTool(*computed_tool_type);
   if (!tool)
     return false;  // Tool does not apply for this toolchain.file.
 
   // Figure out what output(s) this compiler produces.
   SubstitutionWriter::ApplyListToCompilerAsOutputFile(
       target, source, tool->outputs(), outputs);
   return !outputs->empty();
 }