Remove Xcode 15.1/15.2 support for App Intents ahead of implementing support for AppIntentsPackage.

Cherry-pick: 29eb94c

Author: nglevin

apple/internal/BUILD

@@ -342,7 +342,6 @@ bzl_library(
     ],
     deps = [
         ":apple_toolchains",
-        ":cc_toolchain_info_support",
         ":compilation_support",
         ":entitlements_support",
         ":intermediates",

apple/internal/ios_rules.bzl

@@ -280,10 +280,7 @@ def _ios_application_impl(ctx):
         partials.app_intents_metadata_bundle_partial(
             actions = actions,
             cc_toolchains = cc_toolchain_forwarder,
-            ctx = ctx,
             deps = ctx.split_attr.app_intents,
-            disabled_features = ctx.disabled_features,
-            features = features,
             label = label,
             platform_prerequisites = platform_prerequisites,
             json_tool = apple_xplat_toolchain_info.json_tool,
@@ -1317,10 +1314,7 @@ def _ios_extension_impl(ctx):
         partials.app_intents_metadata_bundle_partial(
             actions = actions,
             cc_toolchains = ctx.split_attr._cc_toolchain_forwarder,
-            ctx = ctx,
             deps = ctx.split_attr.app_intents,
-            disabled_features = ctx.disabled_features,
-            features = features,
             label = label,
             platform_prerequisites = platform_prerequisites,
             json_tool = apple_xplat_toolchain_info.json_tool,

apple/internal/linking_support.bzl

@@ -21,10 +21,6 @@ load(
     "@rules_cc//cc/private/rules_impl:objc_compilation_support.bzl",
     objc_compilation_support = "compilation_support",
 )  # buildifier: disable=bzl-visibility
-load(
-    "//apple/internal:cc_toolchain_info_support.bzl",
-    "cc_toolchain_info_support",
-)
 load(
     "//apple/internal:compilation_support.bzl",
     "compilation_support",
@@ -681,139 +677,8 @@ def _lipo_or_symlink_inputs(*, actions, inputs, output, apple_fragment, xcode_co
         # Symlink if there was only a single architecture created; it's faster.
         actions.symlink(target_file = inputs[0], output = output)
 
-# TODO: Delete when we take https://github.com/bazelbuild/rules_apple/commit/29eb94cbc9b1a898582e1e238cc2551ddbeaa58b
-def _legacy_link_multi_arch_binary(
-        *,
-        actions,
-        additional_inputs = [],
-        cc_toolchains,
-        ctx,
-        deps,
-        disabled_features,
-        features,
-        label,
-        stamp = -1,
-        user_link_flags = []):
-    """Experimental Starlark version of multiple architecture binary linking action.
-
-    This Stalark version is an experimental re-write of the apple_common.link_multi_arch_binary API
-    with minimal support for linking multiple architecture binaries from split dependencies.
-
-    Specifically, this lacks support for:
-        - Generating Apple dSYM binaries.
-        - Generating Objective-C linkmaps.
-        - Avoid linking symbols from Objective-C(++) dependencies (i.e. avoid_deps).
-
-    Args:
-        actions: The actions provider from `ctx.actions`.
-        additional_inputs: List of additional `File`s required for the C++ linking action (e.g.
-            linking scripts).
-        cc_toolchains: Dictionary of targets (`ctx.split_attr`) containing CcToolchainInfo
-            providers to use for C++ actions.
-        ctx: The Starlark context for a rule target being built.
-        deps: Dictionary of targets (`ctx.split_attr`) referencing dependencies for a given target
-            to retrieve transitive CcInfo providers for C++ linking action.
-        disabled_features: List of features to be disabled for C++ actions.
-        features: List of features to be enabled for C++ actions.
-        label: Label for the current target (`ctx.label`).
-        stamp: Boolean to indicate whether to include build information in the linked binary.
-            If 1, build information is always included.
-            If 0, the default build information is always excluded.
-            If -1, uses the default behavior, which may be overridden by the --[no]stamp flag.
-            This should be set to 0 when generating the executable output for test rules.
-        user_link_flags: List of `str` user link flags to add to the C++ linking action.
-    Returns:
-        A struct containing the following information:
-            - cc_info: Merged CcInfo providers from each linked binary CcInfo provider.
-            - output_groups: OutputGroupInfo provider with CcInfo validation artifacts.
-            - outputs: List of `struct`s containing the linking output information below.
-                - architecture: The target Apple architecture.
-                - binary: `File` referencing the linked binary.
-                - environment: The target Apple environment.
-                - platform: The target Apple platform/os.
-    """
-    if type(deps) != "dict" or type(cc_toolchains) != "dict":
-        fail(
-            "Expected deps and cc_toolchains to be split attributes (dictionaries).\n",
-            "deps: %s\n" % deps,
-            "cc_toolchains: %s" % cc_toolchains,
-        )
-
-    if deps.keys() != cc_toolchains.keys():
-        fail(
-            "Expected deps and cc_toolchains split attribute keys to match",
-            "deps: %s\n" % deps.keys(),
-            "cc_toolchains: %s\n" % cc_toolchains.keys(),
-        )
-
-    all_cc_infos = []
-    linking_outputs = []
-    validation_artifacts = []
-    for split_attr_key, cc_toolchain_target in cc_toolchains.items():
-        cc_toolchain = cc_toolchain_target[cc_common.CcToolchainInfo]
-        target_triple = cc_toolchain_info_support.get_apple_clang_triplet(cc_toolchain)
-
-        feature_configuration = cc_common.configure_features(
-            cc_toolchain = cc_toolchain,
-            ctx = ctx,
-            language = "objc",
-            requested_features = features,
-            unsupported_features = disabled_features,
-        )
-
-        cc_infos = [
-            dep[CcInfo]
-            for dep in deps[split_attr_key]
-            if CcInfo in dep
-        ]
-        all_cc_infos.extend(cc_infos)
-
-        cc_linking_contexts = [cc_info.linking_context for cc_info in cc_infos]
-        output_name = "{label}_{os}_{architecture}_bin".format(
-            architecture = target_triple.architecture,
-            label = label.name,
-            os = target_triple.os,
-        )
-        linking_output = cc_common.link(
-            actions = actions,
-            additional_inputs = additional_inputs,
-            cc_toolchain = cc_toolchain,
-            feature_configuration = feature_configuration,
-            linking_contexts = cc_linking_contexts,
-            name = output_name,
-            stamp = stamp,
-            user_link_flags = user_link_flags,
-        )
-
-        validation_artifacts.extend([
-            cc_info.compilation_context.validation_artifacts
-            for cc_info in cc_infos
-        ])
-
-        linking_outputs.append(
-            struct(
-                architecture = target_triple.architecture,
-                binary = linking_output.executable,
-                environment = target_triple.environment,
-                platform = target_triple.os,
-            ),
-        )
-
-    return struct(
-        cc_info = cc_common.merge_cc_infos(
-            cc_infos = all_cc_infos,
-        ),
-        output_groups = {
-            "_validation": depset(
-                transitive = validation_artifacts,
-            ),
-        },
-        outputs = linking_outputs,
-    )
-
 linking_support = struct(
     debug_outputs_by_architecture = _debug_outputs_by_architecture,
-    legacy_link_multi_arch_binary = _legacy_link_multi_arch_binary,
     link_multi_arch_binary = _link_multi_arch_binary,
     lipo_or_symlink_inputs = _lipo_or_symlink_inputs,
     register_binary_linking_action = _register_binary_linking_action,

apple/internal/macos_rules.bzl

@@ -254,10 +254,7 @@ def _macos_application_impl(ctx):
         partials.app_intents_metadata_bundle_partial(
             actions = actions,
             cc_toolchains = cc_toolchain_forwarder,
-            ctx = ctx,
             deps = ctx.split_attr.app_intents,
-            disabled_features = ctx.disabled_features,
-            features = features,
             label = label,
             platform_prerequisites = platform_prerequisites,
             json_tool = apple_xplat_toolchain_info.json_tool,

apple/internal/partials/BUILD

@@ -26,7 +26,6 @@ bzl_library(
         "//apple/internal:__pkg__",
     ],
     deps = [
-        "//apple/internal:linking_support",
         "//apple/internal:processor",
         "//apple/internal/providers:app_intents_info",
         "//apple/internal/resource_actions:app_intents",

apple/internal/partials/app_intents_metadata_bundle.bzl

@@ -16,8 +16,6 @@
 
 load("@bazel_skylib//lib:partial.bzl", "partial")
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
-load("//apple/internal:intermediates.bzl", "intermediates")
-load("//apple/internal:linking_support.bzl", "linking_support")
 load("//apple/internal:processor.bzl", "processor")
 load(
     "//apple/internal/providers:app_intents_info.bzl",
@@ -32,10 +30,7 @@ def _app_intents_metadata_bundle_partial_impl(
         *,
         actions,
         cc_toolchains,
-        ctx,
         deps,
-        disabled_features,
-        features,
         label,
         platform_prerequisites,
         json_tool):
@@ -44,52 +39,6 @@ def _app_intents_metadata_bundle_partial_impl(
         # No `app_intents` were set by the rule calling this partial.
         return struct()
 
-    # Link 'stub' binary to use for app intents metadata processing.
-    # This binary should only contain symbols for structs implementing the AppIntents protocol.
-    # Instead of containing all the application/extension/framework binary symbols, allowing
-    # the action to run faster and avoid depending on the application binary linking step.
-    #
-    # TODO(b/295227222): Avoid this linker step for Xcode 15.0+ when rules_swift supports the new
-    # swiftconstvalues-based manner of handling App Intents metadata.
-    link_result = linking_support.legacy_link_multi_arch_binary(
-        actions = actions,
-        cc_toolchains = cc_toolchains,
-        ctx = ctx,
-        deps = deps,
-        disabled_features = disabled_features,
-        features = features,
-        label = label,
-        user_link_flags = [
-            # Force _NSExtensionMain, which exists on all Apple platforms, to
-            # be the main symbol for the binary, just so any main symbol will
-            # exist. Since this binary is discarded afterwards the main symbol
-            # doesn't actually matter. This can be removed when the TODO above
-            # is resolved.
-            "-Wl,-e,_NSExtensionMain",
-            # Force the binary to link Foundation to make the hack above work.
-            "-Wl,-framework,Foundation",
-        ],
-    )
-
-    fat_stub_binary = intermediates.file(
-        actions = actions,
-        target_name = label.name,
-        output_discriminator = None,
-        file_name = "{}_app_intents_stub_binary".format(label.name),
-    )
-
-    linking_support.lipo_or_symlink_inputs(
-        actions = actions,
-        inputs = [output.binary for output in link_result.outputs],
-        output = fat_stub_binary,
-        apple_fragment = platform_prerequisites.apple_fragment,
-        xcode_config = platform_prerequisites.xcode_version_config,
-    )
-
-    label.relative(
-        label.name + "_app_intents_stub_binary",
-    )
-
     # Mirroring Xcode 15+ behavior, the metadata tool only looks at the first split for a given arch
     # rather than every possible set of source files and inputs. Oddly, this only applies to the
     # swift source files and the swiftconstvalues files; the triples and other files do cover all
@@ -99,7 +48,6 @@ def _app_intents_metadata_bundle_partial_impl(
     metadata_bundle = generate_app_intents_metadata_bundle(
         actions = actions,
         apple_fragment = platform_prerequisites.apple_fragment,
-        bundle_binary = fat_stub_binary,
         constvalues_files = [
             swiftconstvalues_file
             for dep in deps[first_cc_toolchain_key]
@@ -111,6 +59,7 @@ def _app_intents_metadata_bundle_partial_impl(
             for intent_module_name in dep[AppIntentsInfo].intent_module_names
         ],
         label = label,
+        platform_prerequisites = platform_prerequisites,
         source_files = [
             swift_source_file
             for dep in deps[first_cc_toolchain_key]
@@ -140,10 +89,7 @@ def app_intents_metadata_bundle_partial(
         *,
         actions,
         cc_toolchains,
-        ctx,
         deps,
-        disabled_features,
-        features,
         label,
         platform_prerequisites,
         json_tool):
@@ -155,10 +101,7 @@ def app_intents_metadata_bundle_partial(
         actions: The actions provider from ctx.actions.
         cc_toolchains: Dictionary of CcToolchainInfo and ApplePlatformInfo providers under a split
             transition to relay target platform information.
-        ctx: The Starlark context for a rule target being built.
         deps: Dictionary of targets under a split transition implementing the AppIntents protocol.
-        disabled_features: List of features to be disabled for C++ link actions.
-        features: List of features to be enabled for C++ link actions.
         label: Label of the target being built.
         platform_prerequisites: Struct containing information on the platform being targeted.
         json_tool: A `files_to_run` wrapping Python's `json.tool` module
@@ -171,10 +114,7 @@ def app_intents_metadata_bundle_partial(
         _app_intents_metadata_bundle_partial_impl,
         actions = actions,
         cc_toolchains = cc_toolchains,
-        ctx = ctx,
         deps = deps,
-        disabled_features = disabled_features,
-        features = features,
         label = label,
         platform_prerequisites = platform_prerequisites,
         json_tool = json_tool,