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

Unified Diff: tools/gn/ninja_action_target_writer.cc

Issue 2387763002: Support for source_target_relative expansion in GN (Closed)
Patch Set: Rebased Created 4 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
« no previous file with comments | « tools/gn/function_process_file_template.cc ('k') | tools/gn/ninja_copy_target_writer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17436323a92d25680c7160a4f96073a6c1e9ec88..77ee2b41ae6017105dc79ec845baa1518c8f8744 100644
--- a/tools/gn/ninja_action_target_writer.cc
+++ b/tools/gn/ninja_action_target_writer.cc
@@ -184,11 +184,11 @@ void NinjaActionTargetWriter::WriteSourceRules(
// very unusual (normally the substitutions will go in one place or the
// other) and the redundant assignment won't bother Ninja.
SubstitutionWriter::WriteNinjaVariablesForSource(
- settings_, sources[i],
+ target_, settings_, sources[i],
target_->action_values().args().required_types(),
args_escape_options, out_);
SubstitutionWriter::WriteNinjaVariablesForSource(
- settings_, sources[i],
+ target_, settings_, sources[i],
target_->action_values().rsp_file_contents().required_types(),
args_escape_options, out_);
@@ -206,7 +206,8 @@ void NinjaActionTargetWriter::WriteOutputFilesForBuildLine(
size_t first_output_index = output_files->size();
SubstitutionWriter::ApplyListToSourceAsOutputFile(
- settings_, target_->action_values().outputs(), source, output_files);
+ target_, settings_, target_->action_values().outputs(), source,
+ output_files);
for (size_t i = first_output_index; i < output_files->size(); i++) {
out_ << " ";
@@ -217,5 +218,5 @@ void NinjaActionTargetWriter::WriteOutputFilesForBuildLine(
void NinjaActionTargetWriter::WriteDepfile(const SourceFile& source) {
path_output_.WriteFile(out_,
SubstitutionWriter::ApplyPatternToSourceAsOutputFile(
- settings_, target_->action_values().depfile(), source));
+ target_, settings_, target_->action_values().depfile(), source));
}
« no previous file with comments | « tools/gn/function_process_file_template.cc ('k') | tools/gn/ninja_copy_target_writer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698