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

Side by Side Diff: build/config/ios/rules.gni

Issue 2183003002: Allow configuration of info_plist_{,target} in ios_xctest_test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@enable_dsym_fixes
Patch Set: Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ios/ios_sdk.gni") 5 import("//build/config/ios/ios_sdk.gni")
6 import("//build/config/mac/base_rules.gni") 6 import("//build/config/mac/base_rules.gni")
7 import("//build/config/mac/symbols.gni") 7 import("//build/config/mac/symbols.gni")
8 8
9 # Generates Info.plist files for Mac apps and frameworks. 9 # Generates Info.plist files for Mac apps and frameworks.
10 # 10 #
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 "{{bundle_plugins_dir}}/$_xctest_output.xctest", 1167 "{{bundle_plugins_dir}}/$_xctest_output.xctest",
1168 ] 1168 ]
1169 } 1169 }
1170 } 1170 }
1171 1171
1172 ios_app_bundle(_host_target) { 1172 ios_app_bundle(_host_target) {
1173 forward_variables_from(invoker, "*", [ "testonly" ]) 1173 forward_variables_from(invoker, "*", [ "testonly" ])
1174 1174
1175 testonly = true 1175 testonly = true
1176 output_name = _host_output 1176 output_name = _host_output
1177 info_plist = "//build/config/ios/Host-Info.plist"
1178 configs += [ "//build/config/ios:xctest_config" ] 1177 configs += [ "//build/config/ios:xctest_config" ]
1179 1178
1179 if (!defined(invoker.info_plist) && !defined(invoker.info_plist_target)) {
1180 info_plist = "//build/config/ios/Host-Info.plist"
olivierrobin 2016/07/26 12:51:34 should we not use info_plist_target if it is defin
sdefresne 2016/07/26 12:52:46 We already forward the "info_plist" if it is defin
1181 }
1182
1180 # Xcode needs those two framework installed in the application (and signed) 1183 # Xcode needs those two framework installed in the application (and signed)
1181 # for the XCTest to run, so install them using extra_system_frameworks. 1184 # for the XCTest to run, so install them using extra_system_frameworks.
1182 _ios_platform_library = "$ios_sdk_platform_path/Developer/Library" 1185 _ios_platform_library = "$ios_sdk_platform_path/Developer/Library"
1183 extra_system_frameworks = [ 1186 extra_system_frameworks = [
1184 "$_ios_platform_library/Frameworks/XCTest.framework", 1187 "$_ios_platform_library/Frameworks/XCTest.framework",
1185 "$_ios_platform_library/PrivateFrameworks/IDEBundleInjection.framework", 1188 "$_ios_platform_library/PrivateFrameworks/IDEBundleInjection.framework",
1186 ] 1189 ]
1187 1190
1188 if (!_is_fat_build || _is_fat_build_main_target) { 1191 if (!_is_fat_build || _is_fat_build_main_target) {
1189 if (!defined(bundle_deps)) { 1192 if (!defined(bundle_deps)) {
(...skipping 14 matching lines...) Expand all
1204 "-rpath", 1207 "-rpath",
1205 "-Xlinker", 1208 "-Xlinker",
1206 "@loader_path/Frameworks", 1209 "@loader_path/Frameworks",
1207 ] 1210 ]
1208 } 1211 }
1209 } 1212 }
1210 1213
1211 set_defaults("ios_xctest_test") { 1214 set_defaults("ios_xctest_test") {
1212 configs = default_executable_configs 1215 configs = default_executable_configs
1213 } 1216 }
OLDNEW
« 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