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

Unified Diff: tools/gn/ninja_utils.cc

Issue 2198433004: Make get_label_info take into account the toolchain for target_gen_dir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused static function Created 4 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_target_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/ninja_utils.cc
diff --git a/tools/gn/ninja_utils.cc b/tools/gn/ninja_utils.cc
index 60d4d3643842cd7594d678cb79daf3f99db85e32..9e9039220af65499b834f0c9bf450e34077a41dc 100644
--- a/tools/gn/ninja_utils.cc
+++ b/tools/gn/ninja_utils.cc
@@ -9,13 +9,15 @@
#include "tools/gn/target.h"
SourceFile GetNinjaFileForTarget(const Target* target) {
- return SourceFile(GetTargetOutputDir(target).value() +
- target->label().name() + ".ninja");
+ return SourceFile(
+ GetBuildDirForTargetAsSourceDir(target, BuildDirType::OBJ).value() +
+ target->label().name() + ".ninja");
}
SourceFile GetNinjaFileForToolchain(const Settings* settings) {
- return SourceFile(GetToolchainOutputDir(settings).value() +
- "toolchain.ninja");
+ return SourceFile(GetBuildDirAsSourceDir(
+ BuildDirContext(settings), BuildDirType::TOOLCHAIN_ROOT).value() +
+ "toolchain.ninja");
}
std::string GetNinjaRulePrefixForToolchain(const Settings* settings) {
« no previous file with comments | « tools/gn/ninja_target_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