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

Unified Diff: build/config/mac/base_rules.gni

Issue 2169973002: Add bundle_deps to ios_{app,framework}_bundle templates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ios-app-bundle-executable
Patch Set: Fix compilation of fat builds. Created 4 years, 5 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 | « build/config/ios/rules.gni ('k') | components/cronet/ios/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/mac/base_rules.gni
diff --git a/build/config/mac/base_rules.gni b/build/config/mac/base_rules.gni
index 151c23503fffa6ad16981fed6292f7794f5b484f..7aecc18d8ec93743e6f5309fb365620a92f93dd5 100644
--- a/build/config/mac/base_rules.gni
+++ b/build/config/mac/base_rules.gni
@@ -244,6 +244,7 @@ template("framework_bundle") {
"*",
[
"assert_no_deps",
+ "bundle_deps",
"data_deps",
"info_plist",
"output_name",
@@ -267,6 +268,10 @@ template("framework_bundle") {
":$_target_name($default_toolchain)",
]
}
+
+ if (defined(invoker.bundle_deps)) {
+ assert(invoker.bundle_deps != [], "mark bundle_deps as used")
+ }
} else {
# If the framework is unversioned, the final _target_name will be the
# create_bundle(_framework_target), otherwise an action with the name
@@ -299,6 +304,7 @@ template("framework_bundle") {
"*",
[
"assert_no_deps",
+ "bundle_deps",
"data_deps",
"info_plist",
"output_name",
@@ -428,6 +434,10 @@ template("framework_bundle") {
}
public_deps += [ ":$_shared_library_bundle_data" ]
+ if (defined(invoker.bundle_deps)) {
+ public_deps += invoker.bundle_deps
+ }
+
bundle_root_dir = _framework_root_dir
bundle_resources_dir = "$bundle_root_dir/Resources"
bundle_executable_dir = "$bundle_root_dir"
« no previous file with comments | « build/config/ios/rules.gni ('k') | components/cronet/ios/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698