Refactor GN source expansions.

tools/gn/filesystem_utils.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/filesystem_utils.h"
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "tools/gn/file_template.h"
 #include "tools/gn/location.h"
 #include "tools/gn/settings.h"
 #include "tools/gn/source_dir.h"
 
 namespace {
 
 enum DotDisposition {
   // The given dot is just part of a filename and is not special.
   NOT_A_DIRECTORY,
 
@@ skipping 303 matching lines @@
   for (; cur >= 0; cur--) {
     if (dir_string[cur] == '/')
       return base::StringPiece(&dir_string[cur + 1], end - cur - 1);
   }
   return base::StringPiece(&dir_string[0], end);
 }
 
 bool EnsureStringIsInOutputDir(const SourceDir& dir,
                                const std::string& str,
                                const Value& originating,
-                               bool allow_templates,
                                Err* err) {
   // This check will be wrong for all proper prefixes "e.g. "/output" will
   // match "/out" but we don't really care since this is just a sanity check.
   const std::string& dir_str = dir.value();
   if (str.compare(0, dir_str.length(), dir_str) == 0)
     return true;  // Output directory is hardcoded.
 
-  if (allow_templates) {
-    // Allow the string to begin with any source expansion inside the output
-    // directory.
-    if (StartsWithASCII(str, FileTemplate::kSourceGenDir, true) ||
-        StartsWithASCII(str, FileTemplate::kSourceOutDir, true))
-      return true;
-  }
-
   *err = Err(originating, "File is not inside output directory.",
       "The given file should be in the output directory. Normally you would "
       "specify\n\"$target_out_dir/foo\" or "
       "\"$target_gen_dir/foo\". I interpreted this as\n\""
       + str + "\".");
   return false;
 }
 
 bool IsPathAbsolute(const base::StringPiece& path) {
   if (path.empty())
@@ skipping 398 matching lines @@
   return GetGenDirForSourceDir(target->settings(), target->label().dir());
 }
 
 SourceDir GetCurrentOutputDir(const Scope* scope) {
   return GetOutputDirForSourceDir(scope->settings(), scope->GetSourceDir());
 }
 
 SourceDir GetCurrentGenDir(const Scope* scope) {
   return GetGenDirForSourceDir(scope->settings(), scope->GetSourceDir());
 }