OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "tools/gn/import_manager.h" | 5 #include "tools/gn/import_manager.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "tools/gn/parse_tree.h" | 9 #include "tools/gn/parse_tree.h" |
10 #include "tools/gn/scheduler.h" | 10 #include "tools/gn/scheduler.h" |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 ImportMap::const_iterator found = imports_.find(file); | 79 ImportMap::const_iterator found = imports_.find(file); |
80 if (found != imports_.end()) { | 80 if (found != imports_.end()) { |
81 delete imported_scope; | 81 delete imported_scope; |
82 imported_scope = found->second; | 82 imported_scope = found->second; |
83 } else { | 83 } else { |
84 imports_[file] = imported_scope; | 84 imports_[file] = imported_scope; |
85 } | 85 } |
86 } | 86 } |
87 } | 87 } |
88 | 88 |
89 return imported_scope->NonRecursiveMergeTo(scope, false, node_for_err, | 89 Scope::MergeOptions options; |
| 90 options.skip_private_vars = true; |
| 91 options.mark_used = true; // Don't require all imported values be used. |
| 92 return imported_scope->NonRecursiveMergeTo(scope, options, node_for_err, |
90 "import", err); | 93 "import", err); |
91 } | 94 } |
OLD | NEW |