summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2016-03-17 06:05:02 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-17 13:06:17 +0000
commit8d689ca9b2db1f4a5629c50e5fc2f97e47795197 (patch)
treefb6c38e30b0d7dfe5b47e5df009df1a7cf0c95bb /build
parentf6cf0cb1501ea3e08b196943d754c3df049a052a (diff)
downloadchromium_src-8d689ca9b2db1f4a5629c50e5fc2f97e47795197.zip
chromium_src-8d689ca9b2db1f4a5629c50e5fc2f97e47795197.tar.gz
chromium_src-8d689ca9b2db1f4a5629c50e5fc2f97e47795197.tar.bz2
Add iossim as data_deps for iOS application bundles.
When targetting simulator, builds iossim as a data_deps for all iOS application bundle as it is required to run the bundle on simulator from the command-line. BUG=594519 Review URL: https://codereview.chromium.org/1800083003 Cr-Commit-Position: refs/heads/master@{#381696}
Diffstat (limited to 'build')
-rw-r--r--build/config/ios/rules.gni9
1 files changed, 7 insertions, 2 deletions
diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
index d4898cd..0cee9ec 100644
--- a/build/config/ios/rules.gni
+++ b/build/config/ios/rules.gni
@@ -147,6 +147,13 @@ 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/$_app_name.app"
bundle_resources_dir = bundle_root_dir
bundle_executable_dir = bundle_root_dir
@@ -158,6 +165,4 @@ template("app") {
# - find a way to make "ninja -C out/Default base_unittests.app" work as
# an alias to "ninja -C out/Default base_unittests" (for convenience
# and compatibility with gyp),
- # - implement //testing/iossim(//build/toolchain/mac:clang_x64) and then
- # add a depency to that target.
}