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

Unified Diff: tools/gn/substitution_type.cc

Issue 2239943002: Forward bundle product_type to the compile_xcassets tool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix grammar. Created 4 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 fcca19dac06cad952d2c375f7a8dde6df4a372b7..7730070c4af1667851dc51334dd19b21954c7ed6 100644
--- a/tools/gn/substitution_type.cc
+++ b/tools/gn/substitution_type.cc
@@ -53,6 +53,7 @@ const char* kSubstitutionNames[SUBSTITUTION_NUM_TYPES] = {
"{{bundle_resources_dir}}", // SUBSTITUTION_BUNDLE_RESOURCES_DIR
"{{bundle_executable_dir}}", // SUBSTITUTION_BUNDLE_EXECUTABLE_DIR
"{{bundle_plugins_dir}}", // SUBSTITUTION_BUNDLE_PLUGINS_DIR
+ "{{bundle_product_type}}", // SUBSTITUTION_BUNDLE_PRODUCT_TYPE
"{{response_file_name}}", // SUBSTITUTION_RSP_FILE_NAME
};
@@ -104,6 +105,7 @@ const char* kSubstitutionNinjaNames[SUBSTITUTION_NUM_TYPES] = {
"bundle_resources_dir", // SUBSTITUTION_BUNDLE_RESOURCES_DIR
"bundle_executable_dir", // SUBSTITUTION_BUNDLE_EXECUTABLE_DIR
"bundle_plugins_dir", // SUBSTITUTION_BUNDLE_PLUGINS_DIR
+ "product_type", // SUBSTITUTION_BUNDLE_PRODUCT_TYPE
"rspfile", // SUBSTITUTION_RSP_FILE_NAME
};
@@ -227,7 +229,8 @@ bool IsValidCopySubstitution(SubstitutionType type) {
bool IsValidCompileXCassetsSubstitution(SubstitutionType type) {
return IsValidToolSubstitution(type) ||
- type == SUBSTITUTION_LINKER_INPUTS;
+ type == SUBSTITUTION_LINKER_INPUTS ||
+ type == SUBSTITUTION_BUNDLE_PRODUCT_TYPE;
}
bool EnsureValidSourcesSubstitutions(
« 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