GN: Separately track labels and origins for lists of stuff

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"
@@ skipping 356 matching lines @@
   // Append data dependencies as implicit dependencies.
   WriteImplicitDependencies(non_linkable_deps);
 
   out_ << std::endl;
 }
 
 void NinjaBinaryTargetWriter::GetDeps(
     std::set<OutputFile>* extra_object_files,
     std::vector<const Target*>* linkable_deps,
     std::vector<const Target*>* non_linkable_deps) const {
-  const std::vector<const Target*>& deps = target_->deps();
+  const LabelTargetVector& deps = target_->deps();
   const std::set<const Target*>& inherited = target_->inherited_libraries();
 
   // Normal deps.
   for (size_t i = 0; i < deps.size(); i++) {
-    if (inherited.find(deps[i]) != inherited.end())
+    if (inherited.find(deps[i].ptr) != inherited.end())
       continue;  // Don't add dupes.
-    ClassifyDependency(deps[i], extra_object_files,
+    ClassifyDependency(deps[i].ptr, extra_object_files,
                        linkable_deps, non_linkable_deps);
   }
 
   // Inherited libraries.
   for (std::set<const Target*>::const_iterator i = inherited.begin();
        i != inherited.end(); ++i) {
     ClassifyDependency(*i, extra_object_files,
                        linkable_deps, non_linkable_deps);
   }
 
   // Data deps.
-  const std::vector<const Target*>& datadeps = target_->datadeps();
+  const LabelTargetVector& datadeps = target_->datadeps();
   for (size_t i = 0; i < datadeps.size(); i++)
-    non_linkable_deps->push_back(datadeps[i]);
+    non_linkable_deps->push_back(datadeps[i].ptr);
 }
 
 void NinjaBinaryTargetWriter::ClassifyDependency(
     const Target* dep,
     std::set<OutputFile>* extra_object_files,
     std::vector<const Target*>* linkable_deps,
     std::vector<const Target*>* non_linkable_deps) const {
   // Only these types of outputs have libraries linked into them. Child deps of
   // static libraries get pushed up the dependency tree until one of these is
   // reached, and source sets don't link at all.
@@ skipping 43 matching lines @@
     }
 
     // Data files.
     const std::vector<SourceFile>& data = target_->data();
     for (size_t i = 0; i < data.size(); i++) {
       out_ << " ";
       path_output_.WriteFile(out_, data[i]);
     }
   }
 }