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

Unified Diff: tools/gn/target.cc

Issue 2140363002: GN: Fix ordering of public and all dep configs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/target.h ('k') | tools/gn/target_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/target.cc
diff --git a/tools/gn/target.cc b/tools/gn/target.cc
index 85955a7168fb371ffea80321bcf8c6c777d4e597..afcde0923d5b4140df8a0779a1c8ce41efddc752 100644
--- a/tools/gn/target.cc
+++ b/tools/gn/target.cc
@@ -424,14 +424,11 @@ bool Target::GetOutputFilesForSource(const SourceFile& source,
return !outputs->empty();
}
-void Target::PullDependentTargetConfigsFrom(const Target* dep) {
- MergeAllDependentConfigsFrom(dep, &configs_, &all_dependent_configs_);
- MergePublicConfigsFrom(dep, &configs_);
-}
-
void Target::PullDependentTargetConfigs() {
for (const auto& pair : GetDeps(DEPS_LINKED))
- PullDependentTargetConfigsFrom(pair.ptr);
+ MergeAllDependentConfigsFrom(pair.ptr, &configs_, &all_dependent_configs_);
+ for (const auto& pair : GetDeps(DEPS_LINKED))
+ MergePublicConfigsFrom(pair.ptr, &configs_);
}
void Target::PullDependentTargetLibsFrom(const Target* dep, bool is_public) {
« no previous file with comments | « tools/gn/target.h ('k') | tools/gn/target_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698