Template invocation fixes in GN

tools/gn/import_manager.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/import_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "tools/gn/parse_tree.h"
 #include "tools/gn/scheduler.h"
 #include "tools/gn/scope_per_file_provider.h"
 
 namespace {
 
 // Returns a newly-allocated scope on success, null on failure.
 Scope* UncachedImport(const Settings* settings,
                       const SourceFile& file,
                       const ParseNode* node_for_err,
                       Err* err) {
   const ParseNode* node = g_scheduler->input_file_manager()->SyncLoadFile(
       node_for_err->GetRange(), settings->build_settings(), file, err);
   if (!node)
     return NULL;
   const BlockNode* block = node->AsBlock();
   CHECK(block);
 
   scoped_ptr<Scope> 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())
     return NULL;
   scope->ClearProcessingImport();
 
   return scope.release();
 }
 
 }  // namesapce
@@ skipping 37 matching lines @@
         imported_scope = found->second;
       } else {
         imports_[file] = imported_scope;
       }
     }
   }
 
   return imported_scope->NonRecursiveMergeTo(scope, false, node_for_err,
                                              "import", err);
 }