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

Unified Diff: tools/gn/setup.cc

Issue 1104313002: Allow paths to be resolved in the GN args file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/setup.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/setup.cc
diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc
index c70eab8e8f084eafceb6b920f777923e8d01b455..d8d525ad7b34b522316a00baf207b27b53bdc0c5 100644
--- a/tools/gn/setup.cc
+++ b/tools/gn/setup.cc
@@ -160,10 +160,10 @@ Setup::Setup()
check_for_bad_items_(true),
check_for_unused_overrides_(true),
check_public_headers_(false),
- empty_settings_(&empty_build_settings_, std::string()),
- dotfile_scope_(&empty_settings_),
+ dotfile_settings_(&build_settings_, std::string()),
+ dotfile_scope_(&dotfile_settings_),
fill_arguments_(true) {
- empty_settings_.set_toolchain_label(Label());
+ dotfile_settings_.set_toolchain_label(Label());
build_settings_.set_item_defined_callback(
base::Bind(&ItemDefinedCallback, scheduler_.main_loop(), builder_));
@@ -340,7 +340,7 @@ bool Setup::FillArgsFromArgsInputFile() {
return false;
}
- Scope arg_scope(&empty_settings_);
+ Scope arg_scope(&dotfile_settings_);
args_root_->Execute(&arg_scope, &err);
if (err.has_error()) {
err.PrintToStdout();
« no previous file with comments | « tools/gn/setup.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698