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

Unified Diff: tools/gn/substitution_type.cc

Issue 493493004: Add GN substitution support for Ninja's $in_newline (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 6 years, 4 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
« no previous file with comments | « tools/gn/substitution_type.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/substitution_type.cc
diff --git a/tools/gn/substitution_type.cc b/tools/gn/substitution_type.cc
index 06157e39fd93200439dd87a1654ba7534396d203..5ffe3e72dab729d0dc6f18cd26c89503452a510f 100644
--- a/tools/gn/substitution_type.cc
+++ b/tools/gn/substitution_type.cc
@@ -37,6 +37,7 @@ const char* kSubstitutionNames[SUBSTITUTION_NUM_TYPES] = {
"{{include_dirs}}", // SUBSTITUTION_INCLUDE_DIRS
"{{inputs}}", // SUBSTITUTION_LINKER_INPUTS
+ "{{inputs_newline}}", // SUBSTITUTION_LINKER_INPUTS_NEWLINE
"{{ldflags}}", // SUBSTITUTION_LDFLAGS
"{{libs}}", // SUBSTITUTION_LIBS
"{{output_extension}}", // SUBSTITUTION_OUTPUT_EXTENSION
@@ -75,6 +76,7 @@ const char* kSubstitutionNinjaNames[SUBSTITUTION_NUM_TYPES] = {
// are used in different contexts and are named differently to keep things
// clear, but they both expand to the "set of input files" for a build rule.
"in", // SUBSTITUTION_LINKER_INPUTS
+ "in_newline", // SUBSTITUTION_LINKER_INPUTS_NEWLINE
"ldflags", // SUBSTITUTION_LDFLAGS
"libs", // SUBSTITUTION_LIBS
"output_extension", // SUBSTITUTION_OUTPUT_EXTENSION
@@ -149,6 +151,7 @@ bool IsValidCompilerOutputsSubstitution(SubstitutionType type) {
bool IsValidLinkerSubstitution(SubstitutionType type) {
return IsValidToolSubstutition(type) ||
type == SUBSTITUTION_LINKER_INPUTS ||
+ type == SUBSTITUTION_LINKER_INPUTS_NEWLINE ||
type == SUBSTITUTION_LDFLAGS ||
type == SUBSTITUTION_LIBS ||
type == SUBSTITUTION_OUTPUT_EXTENSION ||
« no previous file with comments | « tools/gn/substitution_type.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698