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

Unified Diff: tools/gn/ninja_action_target_writer.cc

Issue 2926013002: Support explicit pools in actions (Closed)
Patch Set: Created 3 years, 6 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_action_target_writer.cc
diff --git a/tools/gn/ninja_action_target_writer.cc b/tools/gn/ninja_action_target_writer.cc
index 9e5636237a3b16f77c324101f5e815e29494780c..74270a0d29a05e3c6e2482574c8797328138aa23 100644
--- a/tools/gn/ninja_action_target_writer.cc
+++ b/tools/gn/ninja_action_target_writer.cc
@@ -9,6 +9,7 @@
#include "base/strings/string_util.h"
#include "tools/gn/deps_iterator.h"
#include "tools/gn/err.h"
+#include "tools/gn/pool.h"
#include "tools/gn/settings.h"
#include "tools/gn/string_utils.h"
#include "tools/gn/substitution_writer.h"
@@ -76,8 +77,10 @@ void NinjaActionTargetWriter::Run() {
WriteDepfile(SourceFile());
out_ << std::endl;
}
- if (target_->action_values().is_console()) {
- out_ << " pool = console";
+ if (target_->action_values().pool().ptr) {
+ out_ << " pool = ";
+ out_ << target_->action_values().pool().ptr->GetNinjaName(
+ settings_->default_toolchain_label());
out_ << std::endl;
}
}
@@ -143,6 +146,13 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
out_ << std::endl;
out_ << " description = ACTION " << target_label << std::endl;
out_ << " restat = 1" << std::endl;
+ const Tool* tool = target_->toolchain()->GetTool(Toolchain::TYPE_ACTION);
+ if (tool && tool->pool().ptr) {
+ out_ << " pool = ";
+ out_ << tool->pool().ptr->GetNinjaName(
+ settings_->default_toolchain_label());
+ out_ << std::endl;
+ }
return custom_rule_name;
}

Powered by Google App Engine
This is Rietveld 408576698