Skip to content

Commit 6c983a1

Browse files
nglevinluispadron
authored andcommitted
Remove codesigning_dossier_partial from Apple framework rules.
The dossier signing script signs embedded frameworks and dylibs in the "Frameworks" folder when found. Frameworks themselves do not define entitlements and the optional "provisioning_profile" attribute was only done way back when as a means of "pre-signing" frameworks for app bundles without dossiers. Cherry-pick: d8ecc9b
1 parent 867f0f2 commit 6c983a1

3 files changed

Lines changed: 0 additions & 90 deletions

File tree

apple/internal/ios_rules.bzl

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,21 +1001,6 @@ def _ios_framework_impl(ctx):
10011001
executable_name = executable_name,
10021002
label_name = label.name,
10031003
),
1004-
partials.codesigning_dossier_partial(
1005-
actions = actions,
1006-
apple_mac_toolchain_info = apple_mac_toolchain_info,
1007-
apple_xplat_toolchain_info = apple_xplat_toolchain_info,
1008-
bundle_extension = bundle_extension,
1009-
bundle_location = processor.location.framework,
1010-
bundle_name = bundle_name,
1011-
embed_target_dossiers = False,
1012-
embedded_targets = ctx.attr.frameworks,
1013-
label_name = label.name,
1014-
platform_prerequisites = platform_prerequisites,
1015-
predeclared_outputs = predeclared_outputs,
1016-
provisioning_profile = provisioning_profile,
1017-
rule_descriptor = rule_descriptor,
1018-
),
10191004
# TODO(kaipi): Check if clang_rt dylibs are needed in Frameworks, or if
10201005
# the can be skipped.
10211006
partials.clang_rt_dylibs_partial(
@@ -1598,21 +1583,6 @@ def _ios_dynamic_framework_impl(ctx):
15981583
executable_name = executable_name,
15991584
label_name = label.name,
16001585
),
1601-
partials.codesigning_dossier_partial(
1602-
actions = actions,
1603-
apple_mac_toolchain_info = apple_mac_toolchain_info,
1604-
apple_xplat_toolchain_info = apple_xplat_toolchain_info,
1605-
bundle_extension = bundle_extension,
1606-
bundle_location = processor.location.framework,
1607-
bundle_name = bundle_name,
1608-
embed_target_dossiers = False,
1609-
embedded_targets = ctx.attr.frameworks,
1610-
label_name = label.name,
1611-
platform_prerequisites = platform_prerequisites,
1612-
predeclared_outputs = predeclared_outputs,
1613-
provisioning_profile = provisioning_profile,
1614-
rule_descriptor = rule_descriptor,
1615-
),
16161586
partials.clang_rt_dylibs_partial(
16171587
actions = actions,
16181588
apple_mac_toolchain_info = apple_mac_toolchain_info,

apple/internal/tvos_rules.bzl

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -617,21 +617,6 @@ def _tvos_dynamic_framework_impl(ctx):
617617
executable_name = executable_name,
618618
label_name = label.name,
619619
),
620-
partials.codesigning_dossier_partial(
621-
actions = actions,
622-
apple_mac_toolchain_info = apple_mac_toolchain_info,
623-
apple_xplat_toolchain_info = apple_xplat_toolchain_info,
624-
bundle_extension = bundle_extension,
625-
bundle_location = processor.location.framework,
626-
bundle_name = bundle_name,
627-
embed_target_dossiers = False,
628-
embedded_targets = ctx.attr.frameworks,
629-
label_name = label.name,
630-
platform_prerequisites = platform_prerequisites,
631-
predeclared_outputs = predeclared_outputs,
632-
provisioning_profile = provisioning_profile,
633-
rule_descriptor = rule_descriptor,
634-
),
635620
partials.clang_rt_dylibs_partial(
636621
actions = actions,
637622
apple_mac_toolchain_info = apple_mac_toolchain_info,
@@ -920,21 +905,6 @@ def _tvos_framework_impl(ctx):
920905
platform_prerequisites = platform_prerequisites,
921906
dylibs = main_thread_checker_dylibs.get_from_toolchain(ctx),
922907
),
923-
partials.codesigning_dossier_partial(
924-
actions = actions,
925-
apple_mac_toolchain_info = apple_mac_toolchain_info,
926-
apple_xplat_toolchain_info = apple_xplat_toolchain_info,
927-
bundle_extension = bundle_extension,
928-
bundle_location = processor.location.framework,
929-
bundle_name = bundle_name,
930-
embed_target_dossiers = False,
931-
embedded_targets = ctx.attr.frameworks,
932-
label_name = label.name,
933-
platform_prerequisites = platform_prerequisites,
934-
predeclared_outputs = predeclared_outputs,
935-
provisioning_profile = provisioning_profile,
936-
rule_descriptor = rule_descriptor,
937-
),
938908
partials.debug_symbols_partial(
939909
actions = actions,
940910
bundle_extension = bundle_extension,

apple/internal/watchos_rules.bzl

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -275,21 +275,6 @@ def _watchos_framework_impl(ctx):
275275
executable_name = executable_name,
276276
label_name = label.name,
277277
),
278-
partials.codesigning_dossier_partial(
279-
actions = actions,
280-
apple_mac_toolchain_info = apple_mac_toolchain_info,
281-
apple_xplat_toolchain_info = apple_xplat_toolchain_info,
282-
bundle_extension = bundle_extension,
283-
bundle_location = processor.location.framework,
284-
bundle_name = bundle_name,
285-
embed_target_dossiers = False,
286-
embedded_targets = ctx.attr.frameworks,
287-
label_name = label.name,
288-
platform_prerequisites = platform_prerequisites,
289-
predeclared_outputs = predeclared_outputs,
290-
provisioning_profile = provisioning_profile,
291-
rule_descriptor = rule_descriptor,
292-
),
293278
partials.clang_rt_dylibs_partial(
294279
actions = actions,
295280
apple_mac_toolchain_info = apple_mac_toolchain_info,
@@ -562,21 +547,6 @@ def _watchos_dynamic_framework_impl(ctx):
562547
executable_name = executable_name,
563548
label_name = label.name,
564549
),
565-
partials.codesigning_dossier_partial(
566-
actions = actions,
567-
apple_mac_toolchain_info = apple_mac_toolchain_info,
568-
apple_xplat_toolchain_info = apple_xplat_toolchain_info,
569-
bundle_extension = bundle_extension,
570-
bundle_location = processor.location.framework,
571-
bundle_name = bundle_name,
572-
embed_target_dossiers = False,
573-
embedded_targets = ctx.attr.frameworks,
574-
label_name = label.name,
575-
platform_prerequisites = platform_prerequisites,
576-
predeclared_outputs = predeclared_outputs,
577-
provisioning_profile = provisioning_profile,
578-
rule_descriptor = rule_descriptor,
579-
),
580550
partials.clang_rt_dylibs_partial(
581551
actions = actions,
582552
apple_mac_toolchain_info = apple_mac_toolchain_info,

0 commit comments

Comments
 (0)