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

Unified Diff: tools/gn/setup.cc

Issue 630223002: gn: Support build directories outside the source tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
Index: tools/gn/setup.cc
diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc
index fdbf0f24798f4d417e203d8e0b4d094df05c3134..1bb3932ab32d233138e1c6790efae5efd6ebea4e 100644
--- a/tools/gn/setup.cc
+++ b/tools/gn/setup.cc
@@ -441,7 +441,7 @@ bool Setup::FillSourceDir(const CommandLine& cmdline) {
bool Setup::FillBuildDir(const std::string& build_dir, bool require_exists) {
SourceDir resolved =
SourceDirForCurrentDirectory(build_settings_.root_path()).
- ResolveRelativeDir(build_dir);
+ ResolveRelativeDir(build_dir, build_settings_.root_path());
if (resolved.is_null()) {
Err(Location(), "Couldn't resolve build directory.",
"The build directory supplied (\"" + build_dir + "\") was not valid.").
@@ -553,7 +553,8 @@ bool Setup::FillOtherConfig(const CommandLine& cmdline) {
}
Label root_target_label =
- Label::Resolve(SourceDir("//"), Label(), *root_value, &err);
+ Label::Resolve(SourceDir("//"), Label(), *root_value,
+ build_settings_.root_path(), &err);
if (err.has_error()) {
err.PrintToStdout();
return false;

Powered by Google App Engine
This is Rietveld 408576698