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

Unified Diff: tools/gn/ninja_create_bundle_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: . Created 4 years, 5 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/ninja_create_bundle_target_writer.cc
diff --git a/tools/gn/ninja_create_bundle_target_writer.cc b/tools/gn/ninja_create_bundle_target_writer.cc
index 351ec0c883e91666e1861fa1e51b82ed69ed1511..3b87129f11892a7b70a33e4b03937aafc0fefaec 100644
--- a/tools/gn/ninja_create_bundle_target_writer.cc
+++ b/tools/gn/ninja_create_bundle_target_writer.cc
@@ -174,9 +174,7 @@ NinjaCreateBundleTargetWriter::WriteCompileAssetsCatalogInputDepsStamp(
return dependencies[0]->dependency_output_file();
OutputFile xcassets_input_stamp_file =
- OutputFile(RebasePath(GetTargetOutputDir(target_).value(),
- settings_->build_settings()->build_dir(),
- settings_->build_settings()->root_path_utf8()));
+ GetBuildDirForTargetAsOutputFile(target_, BuildDirType::OBJ);
xcassets_input_stamp_file.value().append(target_->label().name());
xcassets_input_stamp_file.value().append(".xcassets.inputdeps.stamp");
@@ -261,9 +259,7 @@ OutputFile NinjaCreateBundleTargetWriter::WriteCodeSigningInputDepsStamp(
dependencies.end());
OutputFile code_signing_input_stamp_file =
- OutputFile(RebasePath(GetTargetOutputDir(target_).value(),
- settings_->build_settings()->build_dir(),
- settings_->build_settings()->root_path_utf8()));
+ GetBuildDirForTargetAsOutputFile(target_, BuildDirType::OBJ);
code_signing_input_stamp_file.value().append(target_->label().name());
code_signing_input_stamp_file.value().append(".codesigning.inputdeps.stamp");

Powered by Google App Engine
This is Rietveld 408576698