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

Unified Diff: tools/gn/target_generator.cc

Issue 1307223009: tools/gn: Remove fallback to direct_dependent_configs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/target_generator.cc
diff --git a/tools/gn/target_generator.cc b/tools/gn/target_generator.cc
index cd633f200018d9d5bda1ed6813a7a78d88c0e47a..833b382e274147275463fa4b3cbc2577359c6ec8 100644
--- a/tools/gn/target_generator.cc
+++ b/tools/gn/target_generator.cc
@@ -183,17 +183,11 @@ bool TargetGenerator::FillDependentConfigs() {
if (!FillGenericConfigs(variables::kAllDependentConfigs,
&target_->all_dependent_configs()))
return false;
+
if (!FillGenericConfigs(variables::kPublicConfigs,
&target_->public_configs()))
return false;
- // "public_configs" was previously named "direct_dependent_configs", fall
- // back to that if public_configs was undefined.
- if (!scope_->GetValue(variables::kPublicConfigs, false)) {
- if (!FillGenericConfigs("direct_dependent_configs",
- &target_->public_configs()))
- return false;
- }
return true;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698