| Index: tools/gn/ninja_binary_target_writer.cc
|
| diff --git a/tools/gn/ninja_binary_target_writer.cc b/tools/gn/ninja_binary_target_writer.cc
|
| index b99de02282339481c3819f2a7631b907bb5a9c78..bf707bd796d2c9b2cb86237046fa64a6908b1879 100644
|
| --- a/tools/gn/ninja_binary_target_writer.cc
|
| +++ b/tools/gn/ninja_binary_target_writer.cc
|
| @@ -366,13 +366,13 @@ 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);
|
| }
|
|
|
| @@ -383,9 +383,9 @@ void NinjaBinaryTargetWriter::GetDeps(
|
| }
|
|
|
| // 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(
|
|
|