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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/gn/import_manager.cc

Issue 287693002: Support private values in GN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: docs Created 6 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 | « tools/gn/functions.cc ('k') | tools/gn/loader.cc » ('j') | tools/gn/loader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/import_manager.cc
diff --git a/tools/gn/import_manager.cc b/tools/gn/import_manager.cc
index 4bb4b63eee731b3c2cccc834499c7c2e53a58c59..9de6150b8e8659b2378773890464bbb99de6f3be 100644
--- a/tools/gn/import_manager.cc
+++ b/tools/gn/import_manager.cc
@@ -86,6 +86,9 @@ bool ImportManager::DoImport(const SourceFile& file,
}
}
- return imported_scope->NonRecursiveMergeTo(scope, false, node_for_err,
+ Scope::MergeOptions options;
+ options.copy_private_vars = false;
+ options.mark_used = true; // Don't require all imported values be used.
cjhopman 2014/05/14 16:42:43 There's no tests that mark_used=true works.
brettw 2014/05/15 19:44:15 I added one, thanks.
+ return imported_scope->NonRecursiveMergeTo(scope, options, node_for_err,
"import", err);
}
« no previous file with comments | « tools/gn/functions.cc ('k') | tools/gn/loader.cc » ('j') | tools/gn/loader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698