Pass the bundle name directly into linking logic, so that the dSYM bundle and bundle's binary that is generated by shared linking logic can be based off the bundle name instead of the target name.

NOTE: requires updating rules_cc to at least 0.2.13

Cherry-pick: b5724c7

Author: nglevin

apple/apple_binary.bzl

@@ -106,6 +106,7 @@ Resolved Xcode is version {xcode_version}.
         cc_toolchains = cc_toolchain_forwarder,
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_loader = bundle_loader,
+        bundle_name = ctx.label.name,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
         platform_prerequisites = None,

apple/internal/compilation_support.bzl

@@ -196,6 +196,8 @@ def _register_binary_strip_action(
         ctx,
         apple_platform_info,
         binary,
+        bundle_name,
+        cc_toolchain,
         extra_link_args,
         feature_configuration,
         name):
@@ -220,7 +222,8 @@ def _register_binary_strip_action(
 
     stripped_binary = outputs.main_binary(
         actions = ctx.actions,
-        apple_platform_info = apple_platform_info,
+        bundle_name = bundle_name,
+        cc_toolchain = cc_toolchain,
         cpp_fragment = ctx.fragments.cpp,
         label = ctx.label,
         unstripped = False,
@@ -302,6 +305,7 @@ def _register_configuration_specific_link_actions(
         additional_outputs,
         apple_platform_info,
         attr_linkopts,
+        bundle_name,
         common_variables,
         cc_linking_context,
         extra_link_args,
@@ -330,7 +334,8 @@ def _register_configuration_specific_link_actions(
 
     binary = outputs.main_binary(
         actions = ctx.actions,
-        apple_platform_info = apple_platform_info,
+        bundle_name = bundle_name,
+        cc_toolchain = common_variables.toolchain,
         cpp_fragment = ctx.fragments.cpp,
         label = ctx.label,
         unstripped = unstripped,
@@ -346,6 +351,7 @@ def _register_configuration_specific_link_actions(
             apple_platform_info = apple_platform_info,
             attr_linkopts = attr_linkopts,
             binary = binary,
+            bundle_name = bundle_name,
             cc_linking_context = cc_linking_context,
             common_variables = common_variables,
             extra_link_args = extra_link_args,
@@ -378,6 +384,7 @@ def _register_configuration_specific_link_actions_with_cpp_variables(
         apple_platform_info,
         attr_linkopts,
         binary,
+        bundle_name,
         cc_linking_context,
         common_variables,
         extra_link_args,
@@ -434,6 +441,8 @@ def _register_configuration_specific_link_actions_with_cpp_variables(
             ctx = ctx,
             apple_platform_info = apple_platform_info,
             binary = binary,
+            bundle_name = bundle_name,
+            cc_toolchain = common_variables.toolchain,
             extra_link_args = extra_link_args,
             feature_configuration = feature_configuration,
             name = name,

apple/internal/intermediates.bzl

@@ -16,13 +16,15 @@
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
 
-def _intermediates_path_string(*, target_name, output_discriminator):
+def _intermediates_path_string(*, target_name, output_discriminator, no_intermediates = False):
     """Returns a preferred path string given a target name and an optional output discriminator."""
-    if not output_discriminator:
-        return "%s-intermediates" % target_name
-    return "%s-intermediates-%s" % (target_name, output_discriminator)
+    return "{target_name}{intermediates}{output_discriminator}".format(
+        target_name = target_name,
+        intermediates = "-intermediates" if not no_intermediates else "",
+        output_discriminator = "-%s" % output_discriminator if output_discriminator else "",
+    )
 
-def _directory(*, actions, target_name, output_discriminator, dir_name):
+def _directory(*, actions, target_name, output_discriminator, dir_name, no_intermediates = False):
     """Declares an intermediate directory with the given name.
 
     Args:
@@ -32,19 +34,21 @@ def _directory(*, actions, target_name, output_discriminator, dir_name):
       output_discriminator: A string to differentiate between different target intermediate files
           or `None`.
       dir_name: Name of the directory to declare.
+      no_intermediates: Whether to omit the "-intermediates" component of the path.
 
     Returns:
       A new File object that represents an intermediate directory.
     """
     intermediates_path = _intermediates_path_string(
         target_name = target_name,
         output_discriminator = output_discriminator,
+        no_intermediates = no_intermediates,
     )
     return actions.declare_directory(
         paths.join(intermediates_path, dir_name),
     )
 
-def _file(*, actions, target_name, output_discriminator, file_name):
+def _file(*, actions, target_name, output_discriminator, file_name, no_intermediates = False):
     """Declares an intermediate file with the given name.
 
     Args:
@@ -54,13 +58,15 @@ def _file(*, actions, target_name, output_discriminator, file_name):
       output_discriminator: A string to differentiate between different target intermediate files
           or `None`.
       file_name: Name of the file to declare.
+      no_intermediates: Whether to omit the "-intermediates" component of the path.
 
     Returns:
       A new File object that represents an intermediate file.
     """
     intermediates_path = _intermediates_path_string(
         target_name = target_name,
         output_discriminator = output_discriminator,
+        no_intermediates = no_intermediates,
     )
     return actions.declare_file(
         paths.join(intermediates_path, file_name),

apple/internal/ios_rules.bzl

@@ -249,6 +249,7 @@ def _ios_application_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
@@ -632,6 +633,7 @@ def _ios_app_clip_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         platform_prerequisites = platform_prerequisites,
@@ -948,6 +950,7 @@ def _ios_framework_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         # Frameworks do not have entitlements.
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -1224,6 +1227,7 @@ def _ios_extension_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
@@ -1539,6 +1543,7 @@ def _ios_dynamic_framework_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         # Frameworks do not have entitlements.
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -2176,6 +2181,7 @@ def _ios_imessage_extension_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,

apple/internal/linking_support.bzl

@@ -135,6 +135,7 @@ def _link_multi_arch_binary(
         ctx,
         avoid_deps = [],
         build_settings,
+        bundle_name,
         cc_toolchains,
         extra_linkopts = [],
         extra_link_inputs = [],
@@ -153,6 +154,7 @@ def _link_multi_arch_binary(
             bundle loader or any dynamic libraries/frameworks that will be loaded by
             this binary.
         build_settings: A struct with build settings info from AppleXplatToolsToolchainInfo.
+        bundle_name: The name of the bundle name that the linked binary will be a part of, if any.
         cc_toolchains: Dictionary of CcToolchainInfo and ApplePlatformInfo providers under a split
             transition to relay target platform information for related deps.
         extra_linkopts: A list of strings: Extra linkopts to add to the linking action.
@@ -266,14 +268,14 @@ def _link_multi_arch_binary(
             dsym_variants = build_settings.dsym_variant_flag
             if dsym_variants == "bundle":
                 if rule_descriptor:
-                    dsym_bundle_name = ctx.label.name + rule_descriptor.bundle_extension
+                    dsym_bundle_name = bundle_name + rule_descriptor.bundle_extension
                 else:
-                    dsym_bundle_name = ctx.label.name
+                    dsym_bundle_name = bundle_name
 
                 if multi_arch_build:
                     dsym_output = intermediates.directory(
                         actions = ctx.actions,
-                        target_name = ctx.label.name,
+                        target_name = bundle_name,
                         output_discriminator = cc_toolchain.target_gnu_system_name,
                         dir_name = dsym_bundle_name,
                     )
@@ -294,13 +296,13 @@ Please report this as a bug to the Apple BUILD Rules team.
                 ))
             else:
                 main_binary_unstripped_basename = outputs.main_binary_basename(
+                    bundle_name = bundle_name,
                     cpp_fragment = ctx.fragments.cpp,
-                    label_name = ctx.label.name,
                     unstripped = True,
                 )
                 dsym_output = intermediates.file(
                     actions = ctx.actions,
-                    target_name = ctx.label.name,
+                    target_name = bundle_name,
                     output_discriminator = cc_toolchain.target_gnu_system_name,
                     file_name = "{}.dwarf".format(main_binary_unstripped_basename),
                 )
@@ -320,15 +322,16 @@ Please report this as a bug to the Apple BUILD Rules team.
             additional_outputs.append(linkmap)
 
         main_binary_basename = outputs.main_binary_basename(
+            bundle_name = bundle_name,
             cpp_fragment = ctx.fragments.cpp,
-            label_name = ctx.label.name,
             unstripped = False,
         )
 
         executable = compilation_support.register_configuration_specific_link_actions(
             additional_outputs = additional_outputs,
             apple_platform_info = platform_info,
             attr_linkopts = attr_linkopts,
+            bundle_name = bundle_name,
             cc_linking_context = subtracted_cc_linking_context,
             common_variables = common_variables,
             extra_link_args = extra_linkopts,
@@ -435,6 +438,7 @@ def _register_binary_linking_action(
         *,
         avoid_deps = [],
         build_settings,
+        bundle_name,
         bundle_loader = None,
         cc_toolchains,
         entitlements = None,
@@ -456,6 +460,7 @@ def _register_binary_linking_action(
         avoid_deps: A list of `Target`s representing dependencies of the binary but whose
             symbols should not be linked into it.
         build_settings: A struct with build settings info from AppleXplatToolsToolchainInfo.
+        bundle_name: The name of the bundle name that the linked binary will be a part of, if any.
         bundle_loader: For Mach-O bundles, the `Target` whose binary will load this bundle.
             This target must propagate the `AppleExecutableBinaryInfo` provider.
             This simplifies the process of passing the bundle loader to all the arguments
@@ -567,6 +572,7 @@ def _register_binary_linking_action(
         ctx = ctx,
         avoid_deps = all_avoid_deps,
         build_settings = build_settings,
+        bundle_name = bundle_name,
         cc_toolchains = cc_toolchains,
         extra_linkopts = linkopts,
         extra_link_inputs = link_inputs,

apple/internal/macos_rules.bzl

@@ -242,6 +242,7 @@ def _macos_application_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         platform_prerequisites = platform_prerequisites,
@@ -552,6 +553,7 @@ def _macos_bundle_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_loader = ctx.attr.bundle_loader,
+        bundle_name = bundle_name,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = ["-bundle"],
@@ -803,6 +805,7 @@ def _macos_extension_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
@@ -1074,6 +1077,7 @@ def _macos_quick_look_plugin_impl(ctx):
     link_result = linking_support.register_binary_linking_action(
         ctx,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         cc_toolchains = cc_toolchain_forwarder,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -1326,6 +1330,7 @@ def _macos_kernel_extension_impl(ctx):
     link_result = linking_support.register_binary_linking_action(
         ctx,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         cc_toolchains = cc_toolchain_forwarder,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -1567,6 +1572,7 @@ def _macos_spotlight_importer_impl(ctx):
     link_result = linking_support.register_binary_linking_action(
         ctx,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         cc_toolchains = cc_toolchain_forwarder,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -1806,6 +1812,7 @@ def _macos_xpc_service_impl(ctx):
     link_result = linking_support.register_binary_linking_action(
         ctx,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         cc_toolchains = cc_toolchain_forwarder,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -2020,6 +2027,7 @@ def _macos_command_line_application_impl(ctx):
     link_result = linking_support.register_binary_linking_action(
         ctx,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         cc_toolchains = cc_toolchain_forwarder,
         # Command-line applications do not have entitlements.
         entitlements = None,
@@ -2173,6 +2181,7 @@ def _macos_dylib_impl(ctx):
     link_result = linking_support.register_binary_linking_action(
         ctx,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         cc_toolchains = cc_toolchain_forwarder,
         # Dynamic libraries do not have entitlements.
         entitlements = None,
@@ -2864,6 +2873,7 @@ def _macos_framework_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         # Frameworks do not have entitlements.
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -3147,6 +3157,7 @@ def _macos_dynamic_framework_impl(ctx):
         cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
+        bundle_name = bundle_name,
         # Frameworks do not have entitlements.
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,