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

Unified Diff: tools/gn/function_toolchain.cc

Issue 1842563006: DO NOT SUBMIT. Experimental Mac GN Framework support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Binary bundle data Created 4 years, 8 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/bundle_file_rule.cc ('k') | tools/gn/ninja_create_bundle_target_writer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/function_toolchain.cc
diff --git a/tools/gn/function_toolchain.cc b/tools/gn/function_toolchain.cc
index 727be54d7362ddc85e3d4b125ef77aff8f5974c7..8a24bf3a00505457597787039465c958d9982cc8 100644
--- a/tools/gn/function_toolchain.cc
+++ b/tools/gn/function_toolchain.cc
@@ -828,10 +828,12 @@ Value RunTool(Scope* scope,
} else if (IsLinkerTool(tool_type)) {
subst_validator = &IsValidLinkerSubstitution;
subst_output_validator = &IsValidLinkerOutputsSubstitution;
- } else if (tool_type == Toolchain::TYPE_COPY ||
- tool_type == Toolchain::TYPE_COPY_BUNDLE_DATA) {
+ } else if (tool_type == Toolchain::TYPE_COPY) {
subst_validator = &IsValidCopySubstitution;
subst_output_validator = &IsValidCopySubstitution;
+ } else if (tool_type == Toolchain::TYPE_COPY_BUNDLE_DATA) {
+ subst_validator = &IsValidCopyBundleDataSubstitution;
+ subst_output_validator = &IsValidCopyBundleDataSubstitution;
} else if (tool_type == Toolchain::TYPE_COMPILE_XCASSETS) {
subst_validator = &IsValidCompileXCassetsSubstitution;
subst_output_validator = &IsValidCompileXCassetsSubstitution;
« no previous file with comments | « tools/gn/bundle_file_rule.cc ('k') | tools/gn/ninja_create_bundle_target_writer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698