diff options
| -rw-r--r-- | tools/gn/setup.cc | 13 | ||||
| -rw-r--r-- | tools/gn/source_file.cc | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc index f93cd4d..e246e49 100644 --- a/tools/gn/setup.cc +++ b/tools/gn/setup.cc @@ -64,13 +64,12 @@ bool Setup::DoSetup() { return false; // FIXME(brettw) get python path! -/*#if defined(OS_WIN) - build_settings_.set_python_path(base::FilePath( - //L"P:\\depot_tools\\python_bin\\python.exe")); - L"C:\\apps\\depot_tools\\python_bin\\python.exe")); -#else*/ - build_settings_.set_python_path(base::FilePath("python")); -//#endif +#if defined(OS_WIN) + build_settings_.set_python_path( + base::FilePath(FILE_PATH_LITERAL("cmd.exe /c python"))); +#else + build_settings_.set_python_path(base::FilePath(FILE_PATH_LITERAL("python"))); +#endif build_settings_.SetBuildDir(SourceDir("//out/gn/")); diff --git a/tools/gn/source_file.cc b/tools/gn/source_file.cc index de07de1..62f8fb1 100644 --- a/tools/gn/source_file.cc +++ b/tools/gn/source_file.cc @@ -57,7 +57,7 @@ base::FilePath SourceFile::Resolve(const base::FilePath& source_root) const { converted.assign(&value_[2], value_.size() - 2); ConvertPathToSystem(&converted); - return root_path_.Append(UTF8ToFilePath(converted)); + return source_root.Append(UTF8ToFilePath(converted)); #else if (is_system_absolute()) return base::FilePath(value_); |