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/commands.cc

Issue 1413573006: Make GN --as=output relative to the root build directory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « tools/gn/commands.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/commands.cc
diff --git a/tools/gn/commands.cc b/tools/gn/commands.cc
index 3778d5bb6445574e563e4f6788e3280b4b99bda1..ed7a009d6af2c6f7a866d7d82e753b701d07760e 100644
--- a/tools/gn/commands.cc
+++ b/tools/gn/commands.cc
@@ -323,8 +323,6 @@ void PrintTargetsAsOutputs(bool indent,
const BuildSettings* build_settings =
targets[0]->settings()->build_settings();
- SourceDir current_dir = SourceDirForCurrentDirectory(
- build_settings->root_path());
for (const Target* target : targets) {
// Use the link output file if there is one, otherwise fall back to the
// dependency output file (for actions, for example).
@@ -334,7 +332,8 @@ void PrintTargetsAsOutputs(bool indent,
SourceFile output_as_source =
output_file.AsSourceFile(build_settings);
- std::string result = RebasePath(output_as_source.value(), current_dir,
+ std::string result = RebasePath(output_as_source.value(),
+ build_settings->build_dir(),
build_settings->root_path_utf8());
if (indent)
OutputString(" ");
« no previous file with comments | « tools/gn/commands.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698