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

Unified Diff: tools/gn/ninja_copy_target_writer.cc

Issue 1606553002: Add support for Mac/iOS application bundles to GN tool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add unit tests & support for bundle_data_filter Created 4 years, 11 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_copy_target_writer.cc
diff --git a/tools/gn/ninja_copy_target_writer.cc b/tools/gn/ninja_copy_target_writer.cc
index b0313bec3f279dc55bc02a7cbaf1f629d2fa57b4..8c96e761c53cf6e5f42b36e19896899c16450d8b 100644
--- a/tools/gn/ninja_copy_target_writer.cc
+++ b/tools/gn/ninja_copy_target_writer.cc
@@ -15,15 +15,16 @@
#include "tools/gn/toolchain.h"
NinjaCopyTargetWriter::NinjaCopyTargetWriter(const Target* target,
- std::ostream& out)
- : NinjaTargetWriter(target, out) {
+ std::ostream& out,
+ Toolchain::ToolType tool_type)
+ : NinjaTargetWriter(target, out), tool_type_(tool_type) {
}
NinjaCopyTargetWriter::~NinjaCopyTargetWriter() {
}
void NinjaCopyTargetWriter::Run() {
- const Tool* copy_tool = target_->toolchain()->GetTool(Toolchain::TYPE_COPY);
+ const Tool* copy_tool = target_->toolchain()->GetTool(tool_type_);
if (!copy_tool) {
g_scheduler->FailWithError(Err(
nullptr, "Copy tool not defined",
@@ -67,9 +68,8 @@ void NinjaCopyTargetWriter::WriteCopyRules(
<< "Should have one entry exactly.";
const SubstitutionPattern& output_subst = output_subst_list.list()[0];
- std::string tool_name =
- GetNinjaRulePrefixForToolchain(settings_) +
- Toolchain::ToolTypeToName(Toolchain::TYPE_COPY);
+ std::string tool_name = GetNinjaRulePrefixForToolchain(settings_) +
+ Toolchain::ToolTypeToName(tool_type_);
OutputFile input_dep =
WriteInputDepsStampAndGetDep(std::vector<const Target*>());

Powered by Google App Engine
This is Rietveld 408576698