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

Unified Diff: tools/gn/ninja_binary_target_writer.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/function_get_path_info.cc ('k') | tools/gn/ninja_create_bundle_target_writer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/ninja_binary_target_writer.cc
diff --git a/tools/gn/ninja_binary_target_writer.cc b/tools/gn/ninja_binary_target_writer.cc
index 129ddb1b849dfbe5cccb2bd4648356ce7b60f707..da46149efa6b162180238c97d7414b8fdb06f9b5 100644
--- a/tools/gn/ninja_binary_target_writer.cc
+++ b/tools/gn/ninja_binary_target_writer.cc
@@ -417,10 +417,8 @@ OutputFile NinjaBinaryTargetWriter::WriteInputsStampAndGetDep() const {
return OutputFile(settings_->build_settings(), target_->inputs()[0]);
// Make a stamp file.
- OutputFile input_stamp_file(
- RebasePath(GetTargetOutputDir(target_).value(),
- settings_->build_settings()->build_dir(),
- settings_->build_settings()->root_path_utf8()));
+ OutputFile input_stamp_file =
+ GetBuildDirForTargetAsOutputFile(target_, BuildDirType::OBJ);
input_stamp_file.value().append(target_->label().name());
input_stamp_file.value().append(".inputs.stamp");
@@ -1039,7 +1037,7 @@ OutputFile NinjaBinaryTargetWriter::GetWindowsPCHFile(
Toolchain::ToolType tool_type) const {
// Use "obj/{dir}/{target_name}_{lang}.pch" which ends up
// looking like "obj/chrome/browser/browser_cc.pch"
- OutputFile ret = GetTargetOutputDirAsOutputFile(target_);
+ OutputFile ret = GetBuildDirForTargetAsOutputFile(target_, BuildDirType::OBJ);
ret.value().append(target_->label().name());
ret.value().push_back('_');
ret.value().append(GetPCHLangSuffixForToolType(tool_type));
« no previous file with comments | « tools/gn/function_get_path_info.cc ('k') | tools/gn/ninja_create_bundle_target_writer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698