Remove bin_root_path reference from the dynamic framework provider partial along with dead code that was present from use of the vestigial AppleDynamicFrameworkInfo fields.

Cherry-pick: 28d227a

Author: nglevin

apple/internal/apple_framework_import.bzl

@@ -245,12 +245,8 @@ def _apple_dynamic_framework_import_impl(ctx):
     providers.append(cc_info)
 
     # Create AppleDynamicFramework provider.
-    framework_groups = _grouped_framework_files(framework_imports)
-    framework_dirs_set = depset(framework_groups.keys())
     providers.append(new_appledynamicframeworkinfo(
         cc_info = cc_info,
-        framework_dirs = framework_dirs_set,
-        framework_files = depset(framework_imports),
     ))
 
     if "apple._import_framework_via_swiftinterface" in features and framework.swift_interface_imports:

apple/internal/ios_rules.bzl

@@ -877,7 +877,6 @@ def _ios_framework_impl(ctx):
     actions = ctx.actions
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    bin_root_path = ctx.bin_dir.path
     bundle_name, bundle_extension = bundling_support.bundle_full_name(
         custom_bundle_name = ctx.attr.bundle_name,
         label_name = ctx.label.name,
@@ -892,13 +891,6 @@ def _ios_framework_impl(ctx):
     )
     cc_toolchain = find_cpp_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
-    cc_features = cc_common.configure_features(
-        ctx = ctx,
-        cc_toolchain = cc_toolchain,
-        language = "objc",
-        requested_features = ctx.features,
-        unsupported_features = ctx.disabled_features,
-    )
     executable_name = ctx.attr.executable_name
     features = features_support.compute_enabled_features(
         requested_features = ctx.features,
@@ -1059,13 +1051,13 @@ def _ios_framework_impl(ctx):
         partials.framework_headers_partial(hdrs = ctx.files.hdrs),
         partials.framework_provider_partial(
             actions = actions,
-            bin_root_path = bin_root_path,
             binary_artifact = binary_artifact,
-            bundle_name = bundle_name,
             bundle_only = ctx.attr.bundle_only,
-            cc_features = cc_features,
+            cc_configured_features_init = features_support.make_cc_configured_features_init(ctx),
             cc_info = link_result.cc_info,
             cc_toolchain = cc_toolchain,
+            features = features,
+            disabled_features = ctx.disabled_features,
             rule_label = label,
         ),
         partials.resources_partial(
@@ -1473,7 +1465,6 @@ def _ios_dynamic_framework_impl(ctx):
     actions = ctx.actions
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    bin_root_path = ctx.bin_dir.path
     bundle_id = ctx.attr.bundle_id
     bundle_name, bundle_extension = bundling_support.bundle_full_name(
         custom_bundle_name = ctx.attr.bundle_name,
@@ -1653,13 +1644,13 @@ def _ios_dynamic_framework_impl(ctx):
         ),
         partials.framework_provider_partial(
             actions = actions,
-            bin_root_path = bin_root_path,
             binary_artifact = binary_artifact,
-            bundle_name = bundle_name,
             bundle_only = False,
-            cc_features = cc_features,
+            cc_configured_features_init = features_support.make_cc_configured_features_init(ctx),
             cc_info = link_result.cc_info,
             cc_toolchain = cc_toolchain,
+            features = features,
+            disabled_features = ctx.disabled_features,
             rule_label = label,
         ),
         partials.resources_partial(

apple/internal/macos_rules.bzl

@@ -2796,7 +2796,6 @@ def _macos_framework_impl(ctx):
     actions = ctx.actions
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    bin_root_path = ctx.bin_dir.path
     bundle_id = ctx.attr.bundle_id
     bundle_name, bundle_extension = bundling_support.bundle_full_name(
         custom_bundle_name = ctx.attr.bundle_name,
@@ -2806,13 +2805,6 @@ def _macos_framework_impl(ctx):
     executable_name = ctx.attr.executable_name
     cc_toolchain = find_cpp_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
-    cc_features = cc_common.configure_features(
-        ctx = ctx,
-        cc_toolchain = cc_toolchain,
-        language = "objc",
-        requested_features = ctx.features,
-        unsupported_features = ctx.disabled_features,
-    )
     features = features_support.compute_enabled_features(
         requested_features = ctx.features,
         unsupported_features = ctx.disabled_features,
@@ -2972,13 +2964,13 @@ def _macos_framework_impl(ctx):
         partials.framework_headers_partial(hdrs = ctx.files.hdrs),
         partials.framework_provider_partial(
             actions = actions,
-            bin_root_path = bin_root_path,
             binary_artifact = binary_artifact,
-            bundle_name = bundle_name,
             bundle_only = ctx.attr.bundle_only,
-            cc_features = cc_features,
+            cc_configured_features_init = features_support.make_cc_configured_features_init(ctx),
             cc_info = link_result.cc_info,
             cc_toolchain = cc_toolchain,
+            features = features,
+            disabled_features = ctx.disabled_features,
             rule_label = label,
         ),
         partials.resources_partial(
@@ -3073,7 +3065,6 @@ def _macos_dynamic_framework_impl(ctx):
     actions = ctx.actions
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    bin_root_path = ctx.bin_dir.path
     bundle_id = ctx.attr.bundle_id
     bundle_name, bundle_extension = bundling_support.bundle_full_name(
         custom_bundle_name = ctx.attr.bundle_name,
@@ -3253,13 +3244,13 @@ def _macos_dynamic_framework_impl(ctx):
         ),
         partials.framework_provider_partial(
             actions = actions,
-            bin_root_path = bin_root_path,
             binary_artifact = binary_artifact,
-            bundle_name = bundle_name,
             bundle_only = False,
-            cc_features = cc_features,
+            cc_configured_features_init = features_support.make_cc_configured_features_init(ctx),
             cc_info = link_result.cc_info,
             cc_toolchain = cc_toolchain,
+            features = features,
+            disabled_features = ctx.disabled_features,
             rule_label = label,
         ),
         partials.resources_partial(

apple/internal/partials/BUILD

@@ -236,7 +236,6 @@ bzl_library(
         "//apple/internal:framework_import_support",
         "//apple/internal:providers",
         "@bazel_skylib//lib:partial",
-        "@bazel_skylib//lib:paths",
     ],
 )
 

apple/internal/partials/framework_provider.bzl

@@ -18,50 +18,33 @@ load(
     "@bazel_skylib//lib:partial.bzl",
     "partial",
 )
-load(
-    "@bazel_skylib//lib:paths.bzl",
-    "paths",
-)
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//apple/internal:providers.bzl", "new_appledynamicframeworkinfo")
 
 def _framework_provider_partial_impl(
         *,
         actions,
-        bin_root_path,
         binary_artifact,
-        bundle_name,
         bundle_only,
-        cc_features,
+        cc_configured_features_init,
         cc_info,
         cc_toolchain,
+        disabled_features,
+        features,
         rule_label):
     """Implementation for the framework provider partial."""
 
-    # Create a directory structure that the linker can use to reference this
-    # framework. It follows the pattern of
-    # any_path/MyFramework.framework/MyFramework. The absolute path and files are
-    # propagated using the AppleDynamicFrameworkInfo provider.
-    framework_dir = paths.join("frameworks", "%s.framework" % bundle_name)
-    framework_file = actions.declare_file(
-        paths.join(framework_dir, bundle_name),
-    )
-    actions.symlink(
-        target_file = binary_artifact,
-        output = framework_file,
-    )
-
-    absolute_framework_dir = paths.join(
-        bin_root_path,
-        rule_label.package,
-        framework_dir,
+    feature_configuration = cc_configured_features_init(
+        cc_toolchain = cc_toolchain,
+        language = "objc",
+        requested_features = features,
+        unsupported_features = disabled_features,
     )
-
     library_to_link = cc_common.create_library_to_link(
         actions = actions,
         cc_toolchain = cc_toolchain,
-        feature_configuration = cc_features,
+        feature_configuration = feature_configuration,
         dynamic_library = binary_artifact,
     )
     linker_input = cc_common.create_linker_input(
@@ -80,10 +63,7 @@ def _framework_provider_partial_impl(
     )
 
     framework_provider = new_appledynamicframeworkinfo(
-        binary = binary_artifact,
         cc_info = wrapper_cc_info,
-        framework_dirs = depset([absolute_framework_dir]),
-        framework_files = depset([framework_file]),
     )
 
     return struct(
@@ -93,13 +73,13 @@ def _framework_provider_partial_impl(
 def framework_provider_partial(
         *,
         actions,
-        bin_root_path,
         binary_artifact,
-        bundle_name,
         bundle_only,
-        cc_features,
+        cc_configured_features_init,
         cc_info,
         cc_toolchain,
+        disabled_features,
+        features,
         rule_label):
     """Constructor for the framework provider partial.
 
@@ -110,14 +90,15 @@ def framework_provider_partial(
 
     Args:
       actions: The actions provider from `ctx.actions`.
-      bin_root_path: The path to the root `-bin` directory.
       binary_artifact: The linked dynamic framework binary.
-      bundle_name: The name of the output bundle.
       bundle_only: Only include the bundle but do not link the framework
-      cc_features: List of enabled C++ features.
+      cc_configured_features_init: A lambda that is the same as cc_common.configure_features(...)
+          without the need for a `ctx`.
       cc_info: The CcInfo provider containing information about the
           targets linked into the dynamic framework.
       cc_toolchain: The C++ toolchain to use.
+      disabled_features: List of features to be disabled for C++ actions.
+      features: List of features to be enabled for C++ actions.
       rule_label: The label of the target being analyzed.
 
     Returns:
@@ -128,12 +109,12 @@ def framework_provider_partial(
     return partial.make(
         _framework_provider_partial_impl,
         actions = actions,
-        bin_root_path = bin_root_path,
         binary_artifact = binary_artifact,
-        bundle_name = bundle_name,
         bundle_only = bundle_only,
-        cc_features = cc_features,
+        cc_configured_features_init = cc_configured_features_init,
         cc_info = cc_info,
         cc_toolchain = cc_toolchain,
+        disabled_features = disabled_features,
+        features = features,
         rule_label = rule_label,
     )

apple/internal/providers.bzl

@@ -232,15 +232,6 @@ dependencies of the given target if any were generated.
 _AppleDynamicFrameworkInfo = provider(
     doc = "Contains information about an Apple dynamic framework.",
     fields = {
-        "framework_dirs": """\
-The framework path names used as link inputs in order to link against the
-dynamic framework.
-""",
-        "framework_files": """\
-The full set of artifacts that should be included as inputs to link against the
-dynamic framework.
-""",
-        "binary": "The dylib binary artifact of the dynamic framework.",
         "cc_info": """\
 A `CcInfo` which contains information about the transitive dependencies linked
 into the binary.

apple/internal/tvos_rules.bzl

@@ -497,7 +497,6 @@ def _tvos_dynamic_framework_impl(ctx):
     actions = ctx.actions
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    bin_root_path = ctx.bin_dir.path
     bundle_id = ctx.attr.bundle_id
     bundle_name, bundle_extension = bundling_support.bundle_full_name(
         custom_bundle_name = ctx.attr.bundle_name,
@@ -672,13 +671,13 @@ def _tvos_dynamic_framework_impl(ctx):
         ),
         partials.framework_provider_partial(
             actions = actions,
-            bin_root_path = bin_root_path,
             binary_artifact = binary_artifact,
-            bundle_name = bundle_name,
             bundle_only = ctx.attr.bundle_only,
-            cc_features = cc_features,
+            cc_configured_features_init = features_support.make_cc_configured_features_init(ctx),
             cc_info = link_result.cc_info,
             cc_toolchain = cc_toolchain,
+            features = features,
+            disabled_features = ctx.disabled_features,
             rule_label = label,
         ),
         partials.resources_partial(
@@ -785,7 +784,6 @@ def _tvos_framework_impl(ctx):
     actions = ctx.actions
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    bin_root_path = ctx.bin_dir.path
     bundle_name, bundle_extension = bundling_support.bundle_full_name(
         custom_bundle_name = ctx.attr.bundle_name,
         label_name = ctx.label.name,
@@ -800,13 +798,6 @@ def _tvos_framework_impl(ctx):
     )
     cc_toolchain = find_cpp_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
-    cc_features = cc_common.configure_features(
-        ctx = ctx,
-        cc_toolchain = cc_toolchain,
-        language = "objc",
-        requested_features = ctx.features,
-        unsupported_features = ctx.disabled_features,
-    )
     executable_name = ctx.attr.executable_name
     features = features_support.compute_enabled_features(
         requested_features = ctx.features,
@@ -963,13 +954,13 @@ def _tvos_framework_impl(ctx):
         partials.framework_headers_partial(hdrs = ctx.files.hdrs),
         partials.framework_provider_partial(
             actions = actions,
-            bin_root_path = bin_root_path,
             binary_artifact = binary_artifact,
-            bundle_name = bundle_name,
             bundle_only = ctx.attr.bundle_only,
-            cc_features = cc_features,
+            cc_configured_features_init = features_support.make_cc_configured_features_init(ctx),
             cc_info = link_result.cc_info,
             cc_toolchain = cc_toolchain,
+            features = features,
+            disabled_features = ctx.disabled_features,
             rule_label = label,
         ),
         partials.resources_partial(