Remove debug_outputs_provider from the outputs of all Apple rules.

Cherry-pick: 63c974d

Author: nglevin

apple/apple_binary.bzl

@@ -129,7 +129,6 @@ Resolved Xcode is version {xcode_version}.
             ctx,
             dependency_attributes = ["bundle_loader", "deps"],
         ),
-        link_result.debug_outputs_provider,
     ]
 
     # If the binary was an executable, also propagate the appropriate provider

apple/internal/ios_rules.bzl

@@ -547,8 +547,6 @@ def _ios_application_impl(ctx):
                 linking_contexts = linking_contexts,
             ),
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _ios_app_clip_impl(ctx):
@@ -870,8 +868,6 @@ def _ios_app_clip_impl(ctx):
                 linking_contexts = linking_contexts,
             ),
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _ios_framework_impl(ctx):
@@ -1134,8 +1130,6 @@ def _ios_framework_impl(ctx):
                 processor_result.output_groups,
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _ios_extension_impl(ctx):
@@ -1446,8 +1440,6 @@ def _ios_extension_impl(ctx):
             )
         ),
         merged_apple_framework_import_info,
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _ios_dynamic_framework_impl(ctx):
@@ -2370,8 +2362,6 @@ def _ios_imessage_extension_impl(ctx):
             )
         ),
         merged_apple_framework_import_info,
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _ios_sticker_pack_extension_impl(ctx):

apple/internal/linking_support.bzl

@@ -42,7 +42,6 @@ load(
     "AppleDynamicFrameworkInfo",
     "AppleExecutableBinaryInfo",
     "ApplePlatformInfo",
-    "new_appledebugoutputsinfo",
 )
 
 def _archive_multi_arch_static_library(
@@ -181,7 +180,6 @@ def _link_multi_arch_binary(
         *   `output_groups`: A `dict` with the single key `_validation` and as valuea depset
             containing the validation artifacts from the compilation contexts of the CcInfo
             providers of the targets that were linked.
-        *   `debug_outputs_provider`: A deprecated AppleDebugOutputs provider
     """
 
     # TODO: Delete when we drop bazel 7.x
@@ -222,7 +220,6 @@ def _link_multi_arch_binary(
     )
 
     linker_outputs = []
-    legacy_debug_outputs = {}
 
     # $(location...) is only used in one test, and tokenize only affects linkopts in one target
     additional_linker_inputs = getattr(ctx.attr, "additional_linker_inputs", [])
@@ -308,13 +305,6 @@ Please report this as a bug to the Apple BUILD Rules team.
                     file_name = "{}.dwarf".format(main_binary_unstripped_basename),
                 )
 
-                # TODO(b/391401130): Remove this once all users are migrated to the downstream
-                # provider AppleDsymBundleInfo.
-                legacy_debug_outputs.setdefault(
-                    platform_info.target_arch,
-                    {},
-                )["dsym_binary"] = dsym_output
-
             extensions["dsym_path"] = dsym_output.path  # dsym symbol file
             additional_outputs.append(dsym_output)
 
@@ -328,7 +318,6 @@ Please report this as a bug to the Apple BUILD Rules team.
             )
             extensions["linkmap_exec_path"] = linkmap.path  # linkmap file
             additional_outputs.append(linkmap)
-            legacy_debug_outputs.setdefault(platform_info.target_arch, {})["linkmap"] = linkmap
 
         main_binary_basename = outputs.main_binary_basename(
             cpp_fragment = ctx.fragments.cpp,
@@ -374,7 +363,6 @@ Please report this as a bug to the Apple BUILD Rules team.
     return struct(
         output_groups = output_groups,
         outputs = linker_outputs,
-        debug_outputs_provider = new_appledebugoutputsinfo(outputs_map = legacy_debug_outputs),
     )
 
 def _debug_outputs_by_architecture(link_outputs):
@@ -518,7 +506,6 @@ def _register_binary_linking_action(
             and environment that each was built for.
         *   `output_groups`: A `dict` containing output groups that should be returned in the
             `OutputGroupInfo` provider of the calling rule.
-        *   `debug_outputs_provider`: An AppleDebugOutputs provider
     """
     linkopts = []
     link_inputs = []
@@ -611,7 +598,6 @@ def _register_binary_linking_action(
 
     return struct(
         binary = fat_binary,
-        debug_outputs_provider = linking_outputs.debug_outputs_provider,
         objc = getattr(linking_outputs, "objc", None),
         outputs = linking_outputs.outputs,
         output_groups = linking_outputs.output_groups,

apple/internal/macos_rules.bzl

@@ -473,8 +473,6 @@ def _macos_application_impl(ctx):
                 linking_contexts = linking_contexts,
             ),
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _macos_bundle_impl(ctx):
@@ -716,8 +714,6 @@ def _macos_bundle_impl(ctx):
                 processor_result.output_groups,
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _macos_extension_impl(ctx):
@@ -1250,8 +1246,6 @@ def _macos_quick_look_plugin_impl(ctx):
                 processor_result.output_groups,
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _macos_kernel_extension_impl(ctx):
@@ -1505,8 +1499,6 @@ def _macos_kernel_extension_impl(ctx):
                 processor_result.output_groups,
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _macos_spotlight_importer_impl(ctx):
@@ -1746,8 +1738,6 @@ def _macos_spotlight_importer_impl(ctx):
                 processor_result.output_groups,
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _macos_xpc_service_impl(ctx):
@@ -1987,8 +1977,6 @@ def _macos_xpc_service_impl(ctx):
                 processor_result.output_groups,
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _macos_command_line_application_impl(ctx):
@@ -2142,8 +2130,6 @@ def _macos_command_line_application_impl(ctx):
                 linking_contexts = linking_contexts,
             ),
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _macos_dylib_impl(ctx):
@@ -2277,8 +2263,6 @@ def _macos_dylib_impl(ctx):
                 {"dylib": depset(direct = [output_file])},
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 macos_application = rule_factory.create_apple_rule(

apple/internal/providers.bzl

@@ -210,21 +210,6 @@ target if one was generated.
     init = _make_banned_init(provider_name = "AppleCodesigningDossierInfo"),
 )
 
-AppleDebugOutputsInfo, new_appledebugoutputsinfo = provider(
-    """
-Holds debug outputs of an Apple binary rule.
-
-This provider is DEPRECATED. Preferably use `AppleDsymBundleInfo` instead.
-
-The only field is `output_map`, which is a dictionary of:
-  `{ arch: { "dsym_binary": File, "linkmap": File }`
-
-Where `arch` is any Apple architecture such as "arm64" or "armv7".
-""",
-    fields = ["outputs_map"],
-    init = _make_banned_init(provider_name = "AppleDebugOutputsInfo"),
-)
-
 AppleDsymBundleInfo, new_appledsymbundleinfo = provider(
     doc = "Provides information for an Apple dSYM bundle.",
     fields = {

apple/internal/testing/apple_test_bundle_support.bzl

@@ -647,8 +647,6 @@ def _apple_test_bundle_impl(*, ctx, product_type):
                 processor_result.output_groups,
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ])
 
     return providers

apple/internal/tvos_rules.bzl

@@ -474,8 +474,6 @@ def _tvos_application_impl(ctx):
                 linking_contexts = linking_contexts,
             ),
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _tvos_dynamic_framework_impl(ctx):
@@ -1032,8 +1030,6 @@ def _tvos_framework_impl(ctx):
         ),
         new_appleframeworkbundleinfo(),
         new_tvosframeworkbundleinfo(),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _tvos_extension_impl(ctx):
@@ -1322,8 +1318,6 @@ def _tvos_extension_impl(ctx):
             cc_info = link_result.cc_info,
         ),
         new_tvosextensionbundleinfo(),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _tvos_static_framework_impl(ctx):

apple/internal/watchos_rules.bzl

@@ -399,8 +399,6 @@ def _watchos_framework_impl(ctx):
                 processor_result.output_groups,
             )
         ),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _watchos_dynamic_framework_impl(ctx):
@@ -1327,8 +1325,6 @@ def _watchos_extension_impl(ctx):
             )
         ),
         new_watchosextensionbundleinfo(),
-        # TODO(b/228856372): Remove when downstream users are migrated off this provider.
-        link_result.debug_outputs_provider,
     ] + processor_result.providers
 
 def _watchos_static_framework_impl(ctx):

apple/providers.bzl

@@ -36,7 +36,6 @@ load(
     _AppleBundleInfo = "AppleBundleInfo",
     _AppleBundleVersionInfo = "AppleBundleVersionInfo",
     _AppleCodesigningDossierInfo = "AppleCodesigningDossierInfo",
-    _AppleDebugOutputsInfo = "AppleDebugOutputsInfo",
     _AppleDsymBundleInfo = "AppleDsymBundleInfo",
     _AppleDynamicFrameworkInfo = "AppleDynamicFrameworkInfo",
     _AppleExecutableBinaryInfo = "AppleExecutableBinaryInfo",
@@ -88,7 +87,6 @@ AppleBundleInfo = _AppleBundleInfo
 AppleBinaryInfo = _AppleBinaryInfo
 AppleBundleVersionInfo = _AppleBundleVersionInfo
 AppleCodesigningDossierInfo = _AppleCodesigningDossierInfo
-AppleDebugOutputsInfo = _AppleDebugOutputsInfo
 AppleDsymBundleInfo = _AppleDsymBundleInfo
 AppleDynamicFrameworkInfo = _AppleDynamicFrameworkInfo
 AppleExecutableBinaryInfo = _AppleExecutableBinaryInfo