diff options
Diffstat (limited to 'tools/gn/functions.cc')
| -rw-r--r-- | tools/gn/functions.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/gn/functions.cc b/tools/gn/functions.cc index b2787a3..97c2592 100644 --- a/tools/gn/functions.cc +++ b/tools/gn/functions.cc @@ -61,8 +61,10 @@ bool FillTargetBlockScope(const Scope* scope, // the block in. const Scope* default_scope = scope->GetTargetDefaults(target_type); if (default_scope) { - if (!default_scope->NonRecursiveMergeTo(block_scope, false, function, - "target defaults", err)) + Scope::MergeOptions merge_options; + merge_options.skip_private_vars = true; + if (!default_scope->NonRecursiveMergeTo(block_scope, merge_options, + function, "target defaults", err)) return false; } @@ -446,6 +448,10 @@ const char kImport_Help[] = " different value), a runtime error will be thrown. Therefore, it's good\n" " practice to minimize the stuff that an imported file defines.\n" "\n" + " Variables and templates beginning with an underscore '_' are\n" + " considered private and will not be imported. Imported files can use\n" + " such variables for internal computation without affecting other files.\n" + "\n" "Examples:\n" "\n" " import(\"//build/rules/idl_compilation_rule.gni\")\n" |