OLD | NEW |
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 _is_secondary_build = | 9 _is_secondary_build = |
10 additional_toolchains != [] && current_toolchain != default_toolchain | 10 additional_toolchains != [] && current_toolchain != default_toolchain |
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ] | 473 code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ] |
474 } | 474 } |
475 if (defined(invoker.extra_system_frameworks)) { | 475 if (defined(invoker.extra_system_frameworks)) { |
476 foreach(_framework, invoker.extra_system_frameworks) { | 476 foreach(_framework, invoker.extra_system_frameworks) { |
477 code_signing_outputs += [ "$bundle_root_dir/Frameworks/" + | 477 code_signing_outputs += [ "$bundle_root_dir/Frameworks/" + |
478 get_path_info(_framework, "file") ] | 478 get_path_info(_framework, "file") ] |
479 } | 479 } |
480 } | 480 } |
481 code_signing_args = [ | 481 code_signing_args = [ |
482 "code-sign-bundle", | 482 "code-sign-bundle", |
| 483 "-t=" + ios_sdk_name, |
483 "-i=" + ios_code_signing_identity, | 484 "-i=" + ios_code_signing_identity, |
484 "-e=" + rebase_path(_entitlements_path, root_build_dir), | 485 "-e=" + rebase_path(_entitlements_path, root_build_dir), |
485 "-b=" + rebase_path("$target_out_dir/$_output_name", root_build_dir), | 486 "-b=" + rebase_path("$target_out_dir/$_output_name", root_build_dir), |
486 rebase_path(bundle_root_dir, root_build_dir), | 487 rebase_path(bundle_root_dir, root_build_dir), |
487 ] | 488 ] |
488 if (defined(invoker.extra_system_frameworks)) { | 489 if (defined(invoker.extra_system_frameworks)) { |
489 # All framework in extra_system_frameworks are expected to be | 490 # All framework in extra_system_frameworks are expected to be |
490 # system framework and the path to be already system absolute | 491 # system framework and the path to be already system absolute |
491 # so do not use rebase_path here. | 492 # so do not use rebase_path here. |
492 foreach(_framework, invoker.extra_system_frameworks) { | 493 foreach(_framework, invoker.extra_system_frameworks) { |
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1167 code_signing_outputs = [ "$bundle_root_dir/$_output_name" ] | 1168 code_signing_outputs = [ "$bundle_root_dir/$_output_name" ] |
1168 if (_ios_enable_code_signing) { | 1169 if (_ios_enable_code_signing) { |
1169 code_signing_outputs += | 1170 code_signing_outputs += |
1170 [ "$bundle_root_dir/_CodeSignature/CodeResources" ] | 1171 [ "$bundle_root_dir/_CodeSignature/CodeResources" ] |
1171 } | 1172 } |
1172 if (ios_code_signing_identity != "") { | 1173 if (ios_code_signing_identity != "") { |
1173 code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ] | 1174 code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ] |
1174 } | 1175 } |
1175 code_signing_args = [ | 1176 code_signing_args = [ |
1176 "code-sign-bundle", | 1177 "code-sign-bundle", |
| 1178 "-t=" + ios_sdk_name, |
1177 "-i=" + ios_code_signing_identity, | 1179 "-i=" + ios_code_signing_identity, |
1178 "-e=" + rebase_path(_entitlements_path, root_build_dir), | 1180 "-e=" + rebase_path(_entitlements_path, root_build_dir), |
1179 "-b=" + | 1181 "-b=" + |
1180 rebase_path("$_shared_library_dir/$_output_name", root_build_dir), | 1182 rebase_path("$_shared_library_dir/$_output_name", root_build_dir), |
1181 rebase_path(bundle_root_dir, root_build_dir), | 1183 rebase_path(bundle_root_dir, root_build_dir), |
1182 ] | 1184 ] |
1183 if (!_ios_enable_code_signing) { | 1185 if (!_ios_enable_code_signing) { |
1184 code_signing_args += [ "--disable-code-signature" ] | 1186 code_signing_args += [ "--disable-code-signature" ] |
1185 } | 1187 } |
1186 } | 1188 } |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1408 code_signing_outputs = [ "$bundle_root_dir/$_xctest_output" ] | 1410 code_signing_outputs = [ "$bundle_root_dir/$_xctest_output" ] |
1409 if (ios_enable_code_signing) { | 1411 if (ios_enable_code_signing) { |
1410 code_signing_outputs += | 1412 code_signing_outputs += |
1411 [ "$bundle_root_dir/_CodeSignature/CodeResources" ] | 1413 [ "$bundle_root_dir/_CodeSignature/CodeResources" ] |
1412 } | 1414 } |
1413 if (ios_code_signing_identity != "") { | 1415 if (ios_code_signing_identity != "") { |
1414 code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ] | 1416 code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ] |
1415 } | 1417 } |
1416 code_signing_args = [ | 1418 code_signing_args = [ |
1417 "code-sign-bundle", | 1419 "code-sign-bundle", |
| 1420 "-t=" + ios_sdk_name, |
1418 "-i=" + ios_code_signing_identity, | 1421 "-i=" + ios_code_signing_identity, |
1419 "-e=" + rebase_path(_entitlements_path, root_build_dir), | 1422 "-e=" + rebase_path(_entitlements_path, root_build_dir), |
1420 "-b=" + rebase_path("$target_out_dir/$_xctest_output", root_build_dir), | 1423 "-b=" + rebase_path("$target_out_dir/$_xctest_output", root_build_dir), |
1421 rebase_path(bundle_root_dir, root_build_dir), | 1424 rebase_path(bundle_root_dir, root_build_dir), |
1422 ] | 1425 ] |
1423 if (!ios_enable_code_signing) { | 1426 if (!ios_enable_code_signing) { |
1424 code_signing_args += [ "--disable-code-signature" ] | 1427 code_signing_args += [ "--disable-code-signature" ] |
1425 } | 1428 } |
1426 } | 1429 } |
1427 | 1430 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1477 "-rpath", | 1480 "-rpath", |
1478 "-Xlinker", | 1481 "-Xlinker", |
1479 "@loader_path/Frameworks", | 1482 "@loader_path/Frameworks", |
1480 ] | 1483 ] |
1481 } | 1484 } |
1482 } | 1485 } |
1483 | 1486 |
1484 set_defaults("ios_xctest_test") { | 1487 set_defaults("ios_xctest_test") { |
1485 configs = default_executable_configs | 1488 configs = default_executable_configs |
1486 } | 1489 } |
OLD | NEW |