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 delete imported_scope; | 79 delete imported_scope; |
80 imported_scope = found->second; | 80 imported_scope = found->second; |
81 } else { | 81 } else { |
82 imports_[file] = imported_scope; | 82 imports_[file] = imported_scope; |
83 } | 83 } |
84 } | 84 } |
85 } | 85 } |
86 | 86 |
87 Scope::MergeOptions options; | 87 Scope::MergeOptions options; |
88 options.skip_private_vars = true; | 88 options.skip_private_vars = true; |
89 options.mark_used = true; // Don't require all imported values be used. | 89 options.mark_dest_used = true; // Don't require all imported values be used. |
90 return imported_scope->NonRecursiveMergeTo(scope, options, node_for_err, | 90 return imported_scope->NonRecursiveMergeTo(scope, options, node_for_err, |
91 "import", err); | 91 "import", err); |
92 } | 92 } |
OLD | NEW |