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

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

Issue 2437593005: Fix compilation of uber-fat binaries. (Closed)
Patch Set: Fix typo in native_client_sdk/PRESUBMIT.py Created 4 years, 2 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 | « build/config/ios/ios_sdk.gni ('k') | native_client_sdk/PRESUBMIT.py » ('j') | 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 # Invokes lipo on multiple arch-specific binaries to create a fat binary. 9 # Invokes lipo on multiple arch-specific binaries to create a fat binary.
10 # 10 #
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 "info_plist", 391 "info_plist",
392 "info_plist_target", 392 "info_plist_target",
393 "output_name", 393 "output_name",
394 "product_type", 394 "product_type",
395 "visibility", 395 "visibility",
396 ]) 396 ])
397 397
398 visibility = [ ":$_arch_executable_target" ] 398 visibility = [ ":$_arch_executable_target" ]
399 } 399 }
400 400
401 if (use_ios_simulator) { 401 if (current_toolchain == default_toolchain || use_ios_simulator) {
402 _generate_entitlements_target = _target_name + "_gen_entitlements" 402 _generate_entitlements_target = _target_name + "_gen_entitlements"
403 _generate_entitlements_output = 403 _generate_entitlements_output =
404 get_label_info(":$_generate_entitlements_target($default_toolchain)", 404 get_label_info(":$_generate_entitlements_target($default_toolchain)",
405 "target_out_dir") + "/$_output_name.xcent" 405 "target_out_dir") + "/$_output_name.xcent"
406 } 406 }
407 407
408 executable(_arch_executable_target) { 408 executable(_arch_executable_target) {
409 forward_variables_from(invoker, 409 forward_variables_from(invoker,
410 "*", 410 "*",
411 [ 411 [
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 forward_variables_from(invoker, 515 forward_variables_from(invoker,
516 [ 516 [
517 "extra_substitutions", 517 "extra_substitutions",
518 "info_plist", 518 "info_plist",
519 "info_plist_target", 519 "info_plist_target",
520 ]) 520 ])
521 521
522 executable_name = _output_name 522 executable_name = _output_name
523 } 523 }
524 524
525 if (use_ios_simulator) { 525 if (current_toolchain == default_toolchain) {
526 _entitlements_path = "//build/config/ios/entitlements.plist" 526 _entitlements_path = "//build/config/ios/entitlements.plist"
527 if (defined(invoker.entitlements_path)) { 527 if (defined(invoker.entitlements_path)) {
528 _entitlements_path = invoker.entitlements_path 528 _entitlements_path = invoker.entitlements_path
529 } 529 }
530 530
531 action(_generate_entitlements_target) { 531 action(_generate_entitlements_target) {
532 _gen_info_plist_outputs = get_target_outputs(":$_generate_info_plist") 532 _gen_info_plist_outputs = get_target_outputs(":$_generate_info_plist")
533 _info_plist_path = _gen_info_plist_outputs[0] 533 _info_plist_path = _gen_info_plist_outputs[0]
534 534
535 script = "//build/config/ios/codesign.py" 535 script = "//build/config/ios/codesign.py"
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 "-rpath", 1341 "-rpath",
1342 "-Xlinker", 1342 "-Xlinker",
1343 "@loader_path/Frameworks", 1343 "@loader_path/Frameworks",
1344 ] 1344 ]
1345 } 1345 }
1346 } 1346 }
1347 1347
1348 set_defaults("ios_xctest_test") { 1348 set_defaults("ios_xctest_test") {
1349 configs = default_executable_configs 1349 configs = default_executable_configs
1350 } 1350 }
OLDNEW
« no previous file with comments | « build/config/ios/ios_sdk.gni ('k') | native_client_sdk/PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698