Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1198)

Unified Diff: tools/gn/scope_per_file_provider.h

Issue 22290010: Add support for data deps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove switch Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/ninja_writer.cc ('k') | tools/gn/scope_per_file_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/scope_per_file_provider.h
diff --git a/tools/gn/scope_per_file_provider.h b/tools/gn/scope_per_file_provider.h
index 1edb7690aae062b7e57d3785191fd1dad2eea9dc..c6d6537671ee924066f9fb60614800a1ef9231b9 100644
--- a/tools/gn/scope_per_file_provider.h
+++ b/tools/gn/scope_per_file_provider.h
@@ -21,34 +21,10 @@ class ScopePerFileProvider : public Scope::ProgrammaticProvider {
virtual const Value* GetProgrammaticValue(
const base::StringPiece& ident) OVERRIDE;
- // Returns the value to expose to script for the given thing. These values
- // are acually set globally, but are put here so we can keep all logic
- // for converting paths to built-in values in this one file.
- static Value GetRootOutputDir(const Settings* settings);
- static Value GetRootGenDir(const Settings* settings);
-
- // Variable names. These two should be set globally independent of the file
- // being processed.
- static const char* kRootOutputDirName;
- static const char* kRootGenDirName;
-
- // Variable names. These are provided by this class as needed.
- static const char* kDefaultToolchain;
- static const char* kPythonPath;
- static const char* kToolchain;
- static const char* kTargetOutputDirName;
- static const char* kTargetGenDirName;
- static const char* kRelativeRootOutputDirName;
- static const char* kRelativeRootGenDirName;
- static const char* kRelativeTargetOutputDirName;
- static const char* kRelativeTargetGenDirName;
-
private:
+ const Value* GetCurrentToolchain();
const Value* GetDefaultToolchain();
const Value* GetPythonPath();
- const Value* GetToolchain();
- const Value* GetTargetOutputDir();
- const Value* GetTargetGenDir();
const Value* GetRelativeRootOutputDir();
const Value* GetRelativeRootGenDir();
const Value* GetRelativeTargetOutputDir();
@@ -63,11 +39,9 @@ class ScopePerFileProvider : public Scope::ProgrammaticProvider {
SourceFile source_file_;
// All values are lazily created.
+ scoped_ptr<Value> current_toolchain_;
scoped_ptr<Value> default_toolchain_;
scoped_ptr<Value> python_path_;
- scoped_ptr<Value> toolchain_;
- scoped_ptr<Value> target_output_dir_;
- scoped_ptr<Value> target_gen_dir_;
scoped_ptr<Value> relative_root_output_dir_;
scoped_ptr<Value> relative_root_gen_dir_;
scoped_ptr<Value> relative_target_output_dir_;
« no previous file with comments | « tools/gn/ninja_writer.cc ('k') | tools/gn/scope_per_file_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698