From 2e45cefc23c1d7744d11be8fa8ba54d48b47465a Mon Sep 17 00:00:00 2001
From: Erik Kerber <ekerber@slack-corp.com>
Date: Wed, 9 Oct 2024 17:38:35 -0500
Subject: [PATCH] Remove j2objc_dead_code_pruner from rules_apple (#2552)

---
 apple/internal/rule_attrs.bzl | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/apple/internal/rule_attrs.bzl b/apple/internal/rule_attrs.bzl
index efc3607976..00c07a68a9 100644
--- a/apple/internal/rule_attrs.bzl
+++ b/apple/internal/rule_attrs.bzl
@@ -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,
@@ -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 = """