Skip to content

Commit ad97ab6

Browse files
nglevinluispadron
authored andcommitted
Remove references to "ios_signing_cert_name", expecting that the Bazel native flag is replaced by or re-routed to the Starlark build config equivalent.
Cherry-pick: f7e5aa8
1 parent ebb634b commit ad97ab6

3 files changed

Lines changed: 0 additions & 13 deletions

File tree

apple/internal/codesigning_support.bzl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,17 @@ def _codesignopts_from_rule_ctx(ctx):
7474
def _preferred_codesigning_identity(
7575
*,
7676
build_settings,
77-
objc_fragment,
7877
requires_adhoc_signing):
7978
"""Returns the preferred codesigning identity from platform prerequisites.
8079
8180
Args:
8281
build_settings: The build settings from apple_xplat_toolchain_info or platform_prerequisites.
83-
objc_fragment: The objc fragment interface from ctx.fragments.objc.
8482
requires_adhoc_signing: Whether this signing operation requires adhoc signing with the adhoc
8583
pseudo identity. i.e. if this is a simulator build.
8684
"""
8785
if requires_adhoc_signing:
8886
return _ADHOC_PSEUDO_IDENTITY
8987
if build_settings:
90-
if objc_fragment:
91-
# TODO(b/252873771): Remove this fallback when the native Bazel flag
92-
# ios_signing_cert_name is removed.
93-
return (build_settings.signing_certificate_name or
94-
objc_fragment.signing_certificate_name)
9588
return build_settings.signing_certificate_name
9689
return None
9790

@@ -141,7 +134,6 @@ def _codesign_args_for_path(
141134
# use an ad hoc identity.
142135
identity = _preferred_codesigning_identity(
143136
build_settings = platform_prerequisites.build_settings,
144-
objc_fragment = platform_prerequisites.objc_fragment,
145137
requires_adhoc_signing = not platform_prerequisites.platform.is_device,
146138
)
147139
if not identity:

apple/internal/partials/codesigning_dossier.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ def _codesigning_dossier_partial_impl(
276276

277277
codesign_identity = codesigning_support.preferred_codesigning_identity(
278278
build_settings = platform_prerequisites.build_settings,
279-
objc_fragment = platform_prerequisites.objc_fragment,
280279
requires_adhoc_signing = not platform_prerequisites.platform.is_device,
281280
)
282281

apple/internal/xcframework_rules.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,15 +1184,13 @@ def _create_xcframework_codesigning_dossier(
11841184
apple_fragment,
11851185
apple_mac_toolchain_info,
11861186
build_settings,
1187-
objc_fragment,
11881187
rule_label,
11891188
xcode_config):
11901189
"""Generates the codesigning dossier for an XCFramework."""
11911190
output_dossier = actions.declare_file("%s_dossier.zip" % rule_label.name)
11921191

11931192
codesign_identity = codesigning_support.preferred_codesigning_identity(
11941193
build_settings = build_settings,
1195-
objc_fragment = objc_fragment,
11961194
# Never adhoc sign XCFrameworks; the SDK signing requires a valid code signing identity
11971195
# corresponding to a certificate.
11981196
requires_adhoc_signing = False,
@@ -1399,7 +1397,6 @@ def _apple_xcframework_impl(ctx):
13991397
apple_fragment = apple_fragment,
14001398
apple_mac_toolchain_info = apple_mac_toolchain_info,
14011399
build_settings = build_settings,
1402-
objc_fragment = objc_fragment,
14031400
rule_label = rule_label,
14041401
xcode_config = xcode_version_config,
14051402
)
@@ -1781,7 +1778,6 @@ def _apple_static_xcframework_impl(ctx):
17811778
apple_fragment = apple_fragment,
17821779
apple_mac_toolchain_info = apple_mac_toolchain_info,
17831780
build_settings = build_settings,
1784-
objc_fragment = objc_fragment,
17851781
rule_label = rule_label,
17861782
xcode_config = xcode_version_config,
17871783
)

0 commit comments

Comments
 (0)