X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftools%2Fgn%2Fimport_manager.cc;h=4bb4b63eee731b3c2cccc834499c7c2e53a58c59;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=2e8293ed7cff7071459aa733be4af6b1ba31d1e3;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/tools/gn/import_manager.cc b/src/tools/gn/import_manager.cc index 2e8293e..4bb4b63 100644 --- a/src/tools/gn/import_manager.cc +++ b/src/tools/gn/import_manager.cc @@ -25,8 +25,13 @@ Scope* UncachedImport(const Settings* settings, CHECK(block); scoped_ptr scope(new Scope(settings->base_config())); - ScopePerFileProvider per_file_provider(scope.get()); scope->set_source_dir(file.GetDir()); + + // Don't allow ScopePerFileProvider to provide target-related variables. + // These will be relative to the imported file, which is probably not what + // people mean when they use these. + ScopePerFileProvider per_file_provider(scope.get(), false); + scope->SetProcessingImport(); block->ExecuteBlockInScope(scope.get(), err); if (err->has_error())