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

Unified Diff: tools/gn/runtime_deps.cc

Issue 2010173004: [Mac/GN] Collect a bundle's data_deps when using `gn desc runtime_deps`. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | tools/gn/runtime_deps_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/runtime_deps.cc
diff --git a/tools/gn/runtime_deps.cc b/tools/gn/runtime_deps.cc
index 5352de3aadd6640482f4c66dcc74fee8c5aa8254..27225e826968eefcfba14c2bcbed58f958fff447 100644
--- a/tools/gn/runtime_deps.cc
+++ b/tools/gn/runtime_deps.cc
@@ -104,6 +104,12 @@ void RecursiveCollectRuntimeDeps(const Target* target,
AddIfNew(output_file.value(), target, deps, found_files);
}
+ // Data dependencies.
+ for (const auto& dep_pair : target->data_deps()) {
+ RecursiveCollectRuntimeDeps(dep_pair.ptr, true,
+ deps, seen_targets, found_files);
+ }
+
// Do not recurse into bundle targets. A bundle's dependencies should be
// copied into the bundle itself for run-time access.
if (target->output_type() == Target::CREATE_BUNDLE) {
@@ -120,12 +126,6 @@ void RecursiveCollectRuntimeDeps(const Target* target,
RecursiveCollectRuntimeDeps(dep_pair.ptr, false,
deps, seen_targets, found_files);
}
-
- // Data dependencies.
- for (const auto& dep_pair : target->data_deps()) {
- RecursiveCollectRuntimeDeps(dep_pair.ptr, true,
- deps, seen_targets, found_files);
- }
}
bool CollectRuntimeDepsFromFlag(const Builder& builder,
« no previous file with comments | « no previous file | tools/gn/runtime_deps_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698