Avoid conflicting actions for xcframework bundles with custom bundle names (#2883)

Author: jschear

apple/internal/outputs.bzl

@@ -51,9 +51,14 @@ def _archive(
         if bundle_name != label_name:
             archive_relative_path = rule_descriptor.bundle_locations.archive_relative
             root_path = label_name + "_archive-root"
-            return actions.declare_directory(
-                paths.join(root_path, archive_relative_path, bundle_name_with_extension),
-            )
+            if output_discriminator:
+                return actions.declare_directory(
+                    paths.join(root_path, archive_relative_path, output_discriminator, bundle_name_with_extension),
+                )
+            else:
+                return actions.declare_directory(
+                    paths.join(root_path, archive_relative_path, bundle_name_with_extension),
+                )
         if output_discriminator:
             return actions.declare_directory(paths.join(
                 output_discriminator,

test/starlark_tests/apple_xcframework_tests.bzl

@@ -792,6 +792,30 @@ def apple_xcframework_test_suite(name):
         tags = [name],
     )
 
+    directory_test(
+        name = "{}_ios_dynamic_xcframework_custom_bundle_name_tree_artifact_test".format(name),
+        build_settings = {
+            build_settings_labels.use_tree_artifacts_outputs: "True",
+        },
+        target_under_test = "//test/starlark_tests/targets_under_test/apple:ios_dynamic_xcframework_custom_bundle_name",
+        expected_directories = {
+            "CustomBundleName.xcframework": [
+                "Info.plist",
+                "ios-arm64/CustomBundleName.framework/CustomBundleName",
+                "ios-arm64/CustomBundleName.framework/Info.plist",
+                "ios-arm64/CustomBundleName.framework/Headers/CustomBundleName.h",
+                "ios-arm64/CustomBundleName.framework/Headers/shared.h",
+                "ios-arm64/CustomBundleName.framework/Modules/module.modulemap",
+                "ios-x86_64-simulator/CustomBundleName.framework/CustomBundleName",
+                "ios-x86_64-simulator/CustomBundleName.framework/Info.plist",
+                "ios-x86_64-simulator/CustomBundleName.framework/Headers/CustomBundleName.h",
+                "ios-x86_64-simulator/CustomBundleName.framework/Headers/shared.h",
+                "ios-x86_64-simulator/CustomBundleName.framework/Modules/module.modulemap",
+            ],
+        },
+        tags = [name],
+    )
+
     native.test_suite(
         name = name,
         tags = [name],

test/starlark_tests/targets_under_test/apple/BUILD

@@ -353,6 +353,28 @@ apple_xcframework(
     deps = [":fmwk_lib"],
 )
 
+apple_xcframework(
+    name = "ios_dynamic_xcframework_custom_bundle_name",
+    bundle_id = "com.google.example",
+    bundle_name = "CustomBundleName",
+    extension_safe = True,
+    infoplists = [
+        "//test/starlark_tests/resources:Info.plist",
+    ],
+    ios = {
+        "simulator": ["x86_64"],
+        "device": ["arm64"],
+    },
+    minimum_os_versions = {
+        "ios": common.min_os_ios.baseline,
+    },
+    public_hdrs = [
+        "//test/starlark_tests/resources:shared.h",
+    ],
+    tags = common.fixture_tags,
+    deps = [":fmwk_lib"],
+)
+
 genrule(
     name = "generate_umbrella_header",
     outs = ["Umbrella.h"],