Skip to content

Commit

Permalink
Remove j2objc from rules_apple
Browse files Browse the repository at this point in the history
  • Loading branch information
erikkerber committed Oct 9, 2024
1 parent b4a1d1e commit c05b3ee
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 37 deletions.
36 changes: 0 additions & 36 deletions apple/internal/rule_attrs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -148,41 +148,6 @@ def _common_linking_api_attrs(*, deps_cfg):
),
})

def _j2objc_binary_linking_attrs(*, deps_cfg):
"""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.
"_xcrunwrapper": attr.label(
cfg = "exec",
executable = True,
default = Label("@bazel_tools//tools/objc:xcrunwrapper"),
),
}

def _static_library_linking_attrs(*, deps_cfg):
"""Returns dictionary of required attributes for apple_common.link_multi_arch_static_library.
Expand Down Expand Up @@ -236,7 +201,6 @@ 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),
{
"codesign_inputs": attr.label_list(
doc = """
Expand Down
2 changes: 1 addition & 1 deletion apple/internal/rule_factory.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def _create_apple_rule(
cfg = cfg,
doc = doc,
executable = is_executable,
fragments = ["apple", "cpp", "objc", "j2objc"],
fragments = ["apple", "cpp", "objc"],
toolchains = toolchains,
**extra_args
)
Expand Down

0 comments on commit c05b3ee

Please sign in to comment.