Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove j2objc_dead_code_pruner from rules_apple #2552

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Remove j2objc_dead_code_pruner from rules_apple #2552

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28dd1da
Remove j2objc from rules_apple
erikkerber Oct 9, 2024
3bd00a9
Update comment, test removing _dummy_lib
erikkerber Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions apple/internal/rule_attrs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,34 +148,16 @@ def _common_linking_api_attrs(*, deps_cfg):
),
})

def _j2objc_binary_linking_attrs(*, deps_cfg):
def _j2objc_binary_linking_attrs():
"""Returns a dictionary of required attributes for J2ObjC processing code in native linking.

Args:
deps_cfg: Bazel split transition to use on binary attrs, such as deps and split toolchains.
To satisfy native Bazel linking prerequisites, `deps` and this `deps_cfg` attribute must
use the same transition.
"""
return {
"_dummy_lib": attr.label(
cfg = deps_cfg,
default = Label("@bazel_tools//tools/objc:dummy_lib"),
),
"_j2objc_dead_code_pruner": attr.label(
executable = True,
# Setting `allow_single_file=True` would be more correct. Unfortunately,
# doing so prevents using py_binary as the underlying target because py_binary
# produces at least _two_ output files (the executable plus any files in srcs)
allow_files = True,
cfg = "exec",
default = Label("@bazel_tools//tools/objc:j2objc_dead_code_pruner_binary"),
),
# xcrunwrapper is no longer used by rules_apple, but the underlying implementation of
# apple_common.link_multi_arch_binary and j2objc_dead_code_pruner require this attribute.
# See CompilationSupport.java:
# - `registerJ2ObjcDeadCodeRemovalActions()`
# - `registerLinkActions()` --> `registerBinaryStripAction()`
# TODO(b/117932394): Remove this attribute once Bazel no longer uses xcrunwrapper.
# TODO(b/117932394): Remove this once Bazel 6 support is dropped.
"_xcrunwrapper": attr.label(
cfg = "exec",
executable = True,
Expand Down Expand Up @@ -236,7 +218,7 @@ def _binary_linking_attrs(
return dicts.add(
extra_attrs,
_common_linking_api_attrs(deps_cfg = deps_cfg),
_j2objc_binary_linking_attrs(deps_cfg = deps_cfg),
_j2objc_binary_linking_attrs(),
{
"codesign_inputs": attr.label_list(
doc = """
Expand Down