| Index: tools/gn/functions.cc
|
| diff --git a/tools/gn/functions.cc b/tools/gn/functions.cc
|
| index b2787a38b51657b4675266ee96af0287b4c9538d..97c2592c46763b451f95efc441cbfd9ef665089c 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"
|
|
|