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

Unified Diff: trunk/src/tools/gn/ninja_script_target_writer.cc

Issue 46313006: Revert 232657 "GN: toolchain threading cleanup" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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: trunk/src/tools/gn/ninja_script_target_writer.cc
===================================================================
--- trunk/src/tools/gn/ninja_script_target_writer.cc (revision 232660)
+++ trunk/src/tools/gn/ninja_script_target_writer.cc (working copy)
@@ -11,9 +11,8 @@
#include "tools/gn/target.h"
NinjaScriptTargetWriter::NinjaScriptTargetWriter(const Target* target,
- const Toolchain* toolchain,
std::ostream& out)
- : NinjaTargetWriter(target, toolchain, out),
+ : NinjaTargetWriter(target, out),
path_output_no_escaping_(
target->settings()->build_settings()->build_dir(),
ESCAPE_NONE, false) {
@@ -153,7 +152,7 @@
out_ << "build ";
path_output_.WriteFile(out_, helper_.GetTargetOutputFile(target_));
out_ << ": "
- << helper_.GetRulePrefix(target_->settings())
+ << helper_.GetRulePrefix(target_->settings()->toolchain())
<< "stamp";
for (size_t i = 0; i < output_files.size(); i++) {
out_ << " ";
« no previous file with comments | « trunk/src/tools/gn/ninja_script_target_writer.h ('k') | trunk/src/tools/gn/ninja_script_target_writer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698