Share the features configurations from top level rule implementations with the shared Apple linking logic.

Cherry-pick: f608a7b

Author: nglevin

apple/apple_binary.bzl

@@ -84,8 +84,22 @@ Resolved Xcode is version {xcode_version}.
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
     binary_type = ctx.attr.binary_type
     bundle_loader = ctx.attr.bundle_loader
+
+    extra_linkopts = []
+    extra_requested_features = []
+
+    if binary_type == "dylib":
+        extra_linkopts.append("-dynamiclib")
+    elif binary_type == "loadable_bundle":
+        extra_linkopts.extend([
+            "-bundle",
+            "-Wl,-rpath,@loader_path/Frameworks",
+        ])
+        extra_requested_features.append("link_bundle")
+
     cc_configured_features = features_support.cc_configured_features(
         ctx = ctx,
+        extra_requested_features = extra_requested_features,
     )
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
 
@@ -100,16 +114,6 @@ Resolved Xcode is version {xcode_version}.
         secure_features = secure_features,
     )
 
-    extra_linkopts = []
-
-    if binary_type == "dylib":
-        extra_linkopts.append("-dynamiclib")
-    elif binary_type == "loadable_bundle":
-        extra_linkopts.extend([
-            "-bundle",
-            "-Wl,-rpath,@loader_path/Frameworks",
-        ])
-
     extra_linkopts.extend([
         _linker_flag_for_sdk_dylib(dylib)
         for dylib in ctx.attr.sdk_dylibs
@@ -129,6 +133,7 @@ Resolved Xcode is version {xcode_version}.
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_loader = bundle_loader,
         bundle_name = rule_label.name,
+        cc_configured_features = cc_configured_features,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
         platform_prerequisites = None,

apple/apple_static_library.bzl

@@ -91,6 +91,7 @@ Expected Apple platform type of "{platform_type}", but that was not found in {to
 
     archive_result = linking_support.register_static_library_archive_action(
         ctx = ctx,
+        cc_configured_features = cc_configured_features,
         cc_toolchains = cc_toolchain_forwarder,
     )
 

apple/internal/compilation_support.bzl

@@ -39,24 +39,10 @@ visibility([
     "//apple/...",
 ])
 
-def _build_feature_configuration(common_variables):
-    ctx = common_variables.ctx
-
-    enabled_features = []
-    enabled_features.extend(ctx.features)
-    enabled_features.extend(common_variables.extra_enabled_features)
-
-    disabled_features = []
-    disabled_features.extend(ctx.disabled_features)
-    disabled_features.extend(common_variables.extra_disabled_features)
-    disabled_features.append("parse_headers")
-
-    return cc_common.configure_features(
-        ctx = common_variables.ctx,
-        cc_toolchain = common_variables.toolchain,
+def _build_feature_configuration(*, cc_configured_features, cc_toolchain):
+    return cc_configured_features.configure_features(
+        cc_toolchain = cc_toolchain,
         language = "objc",
-        requested_features = enabled_features,
-        unsupported_features = disabled_features,
     )
 
 def _build_fully_linked_variable_extensions(*, archive, libs):
@@ -143,13 +129,21 @@ def _get_libraries_for_linking(libraries_to_link):
         libraries.append(_get_library_for_linking(library_to_link))
     return libraries
 
-def _register_fully_link_action(*, cc_linking_context, common_variables, name):
-    ctx = common_variables.ctx
-    feature_configuration = _build_feature_configuration(common_variables)
+def _register_fully_link_action(
+        *,
+        cc_configured_features,
+        cc_linking_context,
+        common_variables,
+        name):
+    feature_configuration = _build_feature_configuration(
+        cc_configured_features = cc_configured_features,
+        cc_toolchain = common_variables.toolchain,
+    )
 
     libraries_to_link = _libraries_from_linking_context(cc_linking_context).to_list()
     libraries = _get_libraries_for_linking(libraries_to_link)
 
+    ctx = common_variables.ctx
     output_archive = ctx.actions.declare_file(name + ".a")
     extensions = _build_fully_linked_variable_extensions(
         archive = output_archive,
@@ -306,6 +300,7 @@ def _register_configuration_specific_link_actions(
         attr_linkopts,
         bundle_name,
         common_variables,
+        cc_configured_features,
         cc_linking_context,
         extra_link_args,
         extra_link_inputs,
@@ -322,8 +317,12 @@ def _register_configuration_specific_link_actions(
     Returns:
         (File) the linked binary
     """
+    feature_configuration = _build_feature_configuration(
+        cc_configured_features = cc_configured_features,
+        cc_toolchain = common_variables.toolchain,
+    )
+
     ctx = common_variables.ctx
-    feature_configuration = _build_feature_configuration(common_variables)
 
     # TODO: Remove when we drop Bazel 8
     if bazel_features.cc.objc_fragment_has_builtin_objc_strip_action:
@@ -615,7 +614,6 @@ def _register_configuration_specific_link_actions_with_objc_variables(
     return binary
 
 compilation_support = struct(
-    # TODO(b/331163513): Move apple_common.compliation_support.build_common_variables here, too.
     get_library_for_linking = _get_library_for_linking,
     get_static_library_for_linking = _get_static_library_for_linking,
     register_fully_link_action = _register_fully_link_action,

apple/internal/features_support.bzl

@@ -48,7 +48,19 @@ def _cc_configured_features(
     if extra_requested_features:
         features += extra_requested_features
 
-    disabled_features = ctx.disabled_features
+    disabled_features = ctx.disabled_features + [
+        # Disabled include scanning (b/321109350) to work around issues with GrepIncludes actions
+        # being routed to the wrong exec platform.
+        "cc_include_scanning",
+        # Disabled parse_headers (b/174937981) to avoid validating headers from top-level Apple
+        # rules (i.e. legacy uses of ios_framework). Those headers are expected to be as public API
+        # i.e. a "swiftinterface" equivalent for (Objective-)C(++) frameworks and are not expected
+        # to build in any given Bazel WORKSPACE.
+        #
+        # TODO: b/251214758 - Re-enable parse_headers once 3P framework users establish interfaces
+        # via a more stable means, as was done for generated interfaces in Swift.
+        "parse_headers",
+    ]
     if extra_disabled_features:
         disabled_features += extra_disabled_features
 

apple/internal/ios_rules.bzl

@@ -171,6 +171,10 @@ def _ios_application_impl(ctx):
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
 
+    extra_requested_features = []
+    if ctx.attr.testonly:
+        extra_requested_features.append("exported_symbols")
+
     bundle_name, bundle_extension = bundling_support.bundle_full_name(
         custom_bundle_name = ctx.attr.bundle_name,
         label_name = ctx.label.name,
@@ -186,6 +190,7 @@ def _ios_application_impl(ctx):
     bundle_verification_targets = [struct(target = ext) for ext in ctx.attr.extensions]
     cc_configured_features = features_support.cc_configured_features(
         ctx = ctx,
+        extra_requested_features = extra_requested_features,
     )
     features = cc_configured_features.enabled_features
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
@@ -260,6 +265,7 @@ def _ios_application_impl(ctx):
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_name = bundle_name,
+        cc_configured_features = cc_configured_features,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
@@ -646,6 +652,7 @@ def _ios_app_clip_impl(ctx):
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_name = bundle_name,
+        cc_configured_features = cc_configured_features,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         platform_prerequisites = platform_prerequisites,
@@ -915,7 +922,10 @@ def _ios_framework_impl(ctx):
         bundle_name = bundle_name,
         suffix_default = ctx.attr._bundle_id_suffix_default,
     )
-    cc_configured_features = features_support.cc_configured_features(ctx = ctx)
+    cc_configured_features = features_support.cc_configured_features(
+        ctx = ctx,
+        extra_requested_features = ["link_dylib"],
+    )
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     executable_name = ctx.attr.executable_name
     features = cc_configured_features.enabled_features
@@ -971,6 +981,7 @@ def _ios_framework_impl(ctx):
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_name = bundle_name,
+        cc_configured_features = cc_configured_features,
         # Frameworks do not have entitlements.
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -1236,6 +1247,7 @@ def _ios_extension_impl(ctx):
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_name = bundle_name,
+        cc_configured_features = cc_configured_features,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
@@ -1544,6 +1556,7 @@ def _ios_dynamic_framework_impl(ctx):
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_name = bundle_name,
+        cc_configured_features = cc_configured_features,
         # Frameworks do not have entitlements.
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -1786,6 +1799,7 @@ def _ios_static_framework_impl(ctx):
 
     archive_result = linking_support.register_static_library_archive_action(
         ctx = ctx,
+        cc_configured_features = cc_configured_features,
         cc_toolchains = cc_toolchain_forwarder,
     )
     binary_artifact = archive_result.library
@@ -2201,6 +2215,7 @@ def _ios_imessage_extension_impl(ctx):
         avoid_deps = ctx.attr.frameworks,
         build_settings = apple_xplat_toolchain_info.build_settings,
         bundle_name = bundle_name,
+        cc_configured_features = cc_configured_features,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,