From aff3feeaf594cae7d728a9c6b9c7405aa0a65f88 Mon Sep 17 00:00:00 2001 From: sdefresne Date: Thu, 17 Mar 2016 06:05:02 -0700 Subject: [PATCH] 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-Original-Commit-Position: refs/heads/master@{#381696} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 8d689ca9b2db1f4a5629c50e5fc2f97e47795197 --- config/ios/rules.gni | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/ios/rules.gni b/config/ios/rules.gni index d4898cda0..0cee9ecbc 100644 --- a/config/ios/rules.gni +++ b/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. }