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

Unified Diff: tools/gn/ninja_group_target_writer.cc

Issue 561273003: Add public deps to GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 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/ninja_binary_target_writer_unittest.cc ('k') | tools/gn/ninja_group_target_writer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/ninja_group_target_writer.cc
diff --git a/tools/gn/ninja_group_target_writer.cc b/tools/gn/ninja_group_target_writer.cc
index 1b1c30057c1277cd0d66305ae7f589ba21d6dbc1..c672f269c59ba3420947097666e58e534e1581c7 100644
--- a/tools/gn/ninja_group_target_writer.cc
+++ b/tools/gn/ninja_group_target_writer.cc
@@ -5,6 +5,7 @@
#include "tools/gn/ninja_group_target_writer.h"
#include "base/strings/string_util.h"
+#include "tools/gn/deps_iterator.h"
#include "tools/gn/output_file.h"
#include "tools/gn/string_utils.h"
#include "tools/gn/target.h"
@@ -19,16 +20,16 @@ NinjaGroupTargetWriter::~NinjaGroupTargetWriter() {
void NinjaGroupTargetWriter::Run() {
// A group rule just generates a stamp file with dependencies on each of
- // the deps and datadeps in the group.
+ // the deps and data_deps in the group.
std::vector<OutputFile> output_files;
- const LabelTargetVector& deps = target_->deps();
- for (size_t i = 0; i < deps.size(); i++)
- output_files.push_back(deps[i].ptr->dependency_output_file());
+ for (DepsIterator iter(target_, DepsIterator::LINKED_ONLY);
+ !iter.done(); iter.Advance())
+ output_files.push_back(iter.target()->dependency_output_file());
std::vector<OutputFile> data_output_files;
- const LabelTargetVector& datadeps = target_->datadeps();
- for (size_t i = 0; i < datadeps.size(); i++)
- data_output_files.push_back(datadeps[i].ptr->dependency_output_file());
+ const LabelTargetVector& data_deps = target_->data_deps();
+ for (size_t i = 0; i < data_deps.size(); i++)
+ data_output_files.push_back(data_deps[i].ptr->dependency_output_file());
WriteStampForTarget(output_files, data_output_files);
}
« no previous file with comments | « tools/gn/ninja_binary_target_writer_unittest.cc ('k') | tools/gn/ninja_group_target_writer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698