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

Unified Diff: build/config/ios/rules.gni

Issue 1845753002: Work around a bug where create_bundle() is ignoring data_deps() in iOS GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ios/rules.gni
diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
index 8afbbcab5a813a63a9b7d4bd5a18b2eb343fb8e0..568cfadad1c60206441306a6c0edcf92e8731cae 100644
--- a/build/config/ios/rules.gni
+++ b/build/config/ios/rules.gni
@@ -114,6 +114,16 @@ template("app") {
libs = []
}
libs += [ "UIKit.framework" ]
+
+ # TODO(crbug.com/599203) - iossim should probably be a data dependency
+ # of the create_bundle(target_name) target instead but at the moment
+ # create_bundle() is ignoring data_deps.
+ if (use_ios_simulator) {
+ if (!defined(data_deps)) {
+ data_deps = []
+ }
+ data_deps += [ "//testing/iossim(${host_toolchain})" ]
+ }
}
bundle_data(_bundle_data_executable) {
@@ -148,13 +158,6 @@ template("app") {
":$_bundle_data_info_plist",
]
- if (use_ios_simulator) {
- if (!defined(data_deps)) {
- data_deps = []
- }
- data_deps += [ "//testing/iossim(${host_toolchain})" ]
- }
-
bundle_root_dir = "$root_out_dir/$_output_name.app"
bundle_resources_dir = bundle_root_dir
bundle_executable_dir = bundle_root_dir
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698