Index: tools/gn/loader.cc |
diff --git a/tools/gn/loader.cc b/tools/gn/loader.cc |
index 2893e2394cbb4a124958895d89338a796c8fb70d..885670ab80572bd1d1d5d82baec4265cc1c3c631 100644 |
--- a/tools/gn/loader.cc |
+++ b/tools/gn/loader.cc |
@@ -247,6 +247,10 @@ void LoaderImpl::BackgroundLoadFile(const Settings* settings, |
ScopePerFileProvider per_file_provider(&our_scope, true); |
our_scope.set_source_dir(file_name.GetDir()); |
+ // Targets, etc. generated as part of running this file will end up here. |
+ Scope::ItemVector collected_items; |
+ our_scope.set_item_collector(&collected_items); |
+ |
ScopedTrace trace(TraceItem::TRACE_FILE_EXECUTE, file_name.value()); |
trace.SetToolchain(settings->toolchain_label()); |
@@ -255,6 +259,10 @@ void LoaderImpl::BackgroundLoadFile(const Settings* settings, |
if (err.has_error()) |
g_scheduler->FailWithError(err); |
+ // Pass all of the items that were defined off to the builder. |
+ for (size_t i = 0; i < collected_items.size(); i++) |
+ settings->build_settings()->ItemDefined(collected_items[i]->Pass()); |
+ |
trace.Done(); |
main_loop_->PostTask(FROM_HERE, base::Bind(&LoaderImpl::DidLoadFile, this)); |