Switch from building paths out of the split transition key to using target_gnu_system_name, for consistency with static library archive behavior and to aid in future onboarding of Bazel platforms.

Further, have the dSYM bundle paths either match the flat file dSYM outputs behavior ("dynamic" XCFrameworks) or avoid subdirectories (other linked Apple binary output rules).

Cherry-pick: bee6a12

Author: nglevin

apple/internal/linking_support.bzl

@@ -232,6 +232,8 @@ def _link_multi_arch_binary(
     ]
     attr_linkopts = [token for opt in attr_linkopts for token in ctx.tokenize(opt)]
 
+    multi_arch_build = len(cc_toolchains) > 1
+
     for split_transition_key, child_toolchain in cc_toolchains.items():
         cc_toolchain = child_toolchain[cc_common.CcToolchainInfo]
         deps = split_deps.get(split_transition_key, [])
@@ -271,13 +273,20 @@ def _link_multi_arch_binary(
                 else:
                     dsym_bundle_name = ctx.label.name
 
-                # Avoiding "intermediates" as this will be the canonical dSYM in a single arch build
-                dsym_output = ctx.actions.declare_directory(
-                    "{split_transition_key}/{dsym_bundle_name}.dSYM".format(
-                        split_transition_key = split_transition_key,
-                        dsym_bundle_name = dsym_bundle_name,
-                    ),
-                )
+                if multi_arch_build:
+                    dsym_output = intermediates.directory(
+                        actions = ctx.actions,
+                        target_name = ctx.label.name,
+                        output_discriminator = cc_toolchain.target_gnu_system_name,
+                        dir_name = dsym_bundle_name,
+                    )
+                else:
+                    # Avoiding "intermediates" as this will be the only dSYM in a single arch build.
+                    dsym_output = ctx.actions.declare_directory(
+                        "{dsym_bundle_name}.dSYM".format(
+                            dsym_bundle_name = dsym_bundle_name,
+                        ),
+                    )
             elif dsym_variants != "flat":
                 fail("""
 Internal Error: Found unsupported dsym_variant_flag: {dsym_variants}.
@@ -295,7 +304,7 @@ Please report this as a bug to the Apple BUILD Rules team.
                 dsym_output = intermediates.file(
                     actions = ctx.actions,
                     target_name = ctx.label.name,
-                    output_discriminator = split_transition_key,
+                    output_discriminator = cc_toolchain.target_gnu_system_name,
                     file_name = "{}.dwarf".format(main_binary_unstripped_basename),
                 )
 
@@ -314,7 +323,7 @@ Please report this as a bug to the Apple BUILD Rules team.
             linkmap = intermediates.file(
                 actions = ctx.actions,
                 target_name = ctx.label.name,
-                output_discriminator = split_transition_key,
+                output_discriminator = cc_toolchain.target_gnu_system_name,
                 file_name = ctx.label.name + ".linkmap",
             )
             extensions["linkmap_exec_path"] = linkmap.path  # linkmap file

apple/internal/partials/debug_symbols.bzl

@@ -396,9 +396,9 @@ def _bundle_dsym_files(
     dsym_variants = platform_prerequisites.build_settings.dsym_variant_flag
 
     if dsym_variants == "bundle":
-        if len(dsym_inputs) == 1:
-            # If we only have one dSYM binary, we can just use it as-is, no need to merge + lipo its
-            # contents.
+        if len(dsym_inputs) == 1 and not output_discriminator:
+            # If we only have one dSYM bundle and we don't need to rename the dSYM bundle, we can
+            # just use it as-is, no need to merge + lipo its contents.
             return [], dsym_inputs.values()[0]
 
         # 1. Lipo the binaries (Resources/DWARF/{main_binary_basename}).

test/starlark_tests/apple_xcframework_tests.bzl

@@ -349,8 +349,8 @@ def apple_xcframework_test_suite(name):
         target_under_test = "//test/starlark_tests/targets_under_test/apple:ios_dynamic_xcframework",
         output_group_name = "dsyms",
         expected_outputs = [
-            "ios_arm64_device/ios_dynamic_xcframework.dSYM",
-            "ios_x86_64_simulator/ios_dynamic_xcframework.dSYM",
+            "ios_dynamic_xcframework_ios_device.framework.dSYM",
+            "ios_dynamic_xcframework_ios_simulator.framework.dSYM",
         ],
         tags = [name],
     )

test/starlark_tests/macos_application_tests.bzl

@@ -324,7 +324,7 @@ def macos_application_test_suite(name):
         name = "{}_runfiles_dsymutil_bundle_test".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/macos:app",
         expected_runfiles = [
-            "third_party/bazel_rules/rules_apple/test/starlark_tests/targets_under_test/macos/darwin_arm64/app.app.dSYM",
+            "third_party/bazel_rules/rules_apple/test/starlark_tests/targets_under_test/macos/app.app.dSYM",
         ],
         tags = [name],
     )

test/starlark_tests/macos_command_line_application_tests.bzl

@@ -226,7 +226,7 @@ def macos_command_line_application_test_suite(name):
         name = "{}_runfiles_dsymutil_bundle_test".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/macos:cmd_app_basic",
         expected_runfiles = [
-            "third_party/bazel_rules/rules_apple/test/starlark_tests/targets_under_test/macos/darwin_arm64/cmd_app_basic.dSYM",
+            "third_party/bazel_rules/rules_apple/test/starlark_tests/targets_under_test/macos/cmd_app_basic.dSYM",
         ],
         tags = [name],
     )

test/starlark_tests/visionos_application_tests.bzl

@@ -186,7 +186,7 @@ def visionos_application_test_suite(name):
         target_under_test = "//test/starlark_tests/targets_under_test/visionos:app",
         output_group_name = "dsyms",
         expected_outputs = [
-            "visionos_sim_arm64/app.app.dSYM",
+            "app.app.dSYM",
         ],
         tags = [
             name,
@@ -210,10 +210,10 @@ def visionos_application_test_suite(name):
         name = "{}_dsym_bundle_info_dsymutil_bundle_test".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/visionos:app",
         expected_direct_dsyms = [
-            "visionos_sim_arm64/app.app.dSYM",
+            "app.app.dSYM",
         ],
         expected_transitive_dsyms = [
-            "visionos_sim_arm64/app.app.dSYM",
+            "app.app.dSYM",
         ],
         tags = [
             name,