Add new fields to AppleBinaryInfo matching AppleBundleInfo to relay target platform information.

Cherry-pick: e54e480

Author: nglevin

apple/apple_static_library.bzl

@@ -81,6 +81,7 @@ Expected Apple platform type of "{platform_type}", but that was not found in {to
     providers = [
         DefaultInfo(files = depset(files_to_build), runfiles = runfiles),
         new_applebinaryinfo(
+            # Since the rule is deprecated, we only set what's needed for legacy users.
             binary = archive_result.library,
             infoplist = None,
         ),

apple/internal/BUILD

@@ -87,6 +87,7 @@ bzl_library(
         ":rule_attrs",
         ":rule_factory",
         ":transition_support",
+        "@build_bazel_apple_support//lib:apple_support",
     ],
 )
 

apple/internal/apple_universal_binary.bzl

@@ -14,6 +14,10 @@
 
 """Implementation for apple universal binary rules."""
 
+load(
+    "@build_bazel_apple_support//lib:apple_support.bzl",
+    "apple_support",
+)
 load(
     "//apple/internal:linking_support.bzl",
     "linking_support",
@@ -66,8 +70,10 @@ def _apple_universal_binary_impl(ctx):
 
     return [
         new_applebinaryinfo(
+            archs = sorted(ctx.attr.forced_cpus),
             binary = fat_binary,
-            infoplist = None,
+            platform_type = apple_support.target_os_from_rule_ctx(ctx),
+            target_environment = apple_support.target_environment_from_rule_ctx(ctx),
         ),
         DefaultInfo(
             executable = fat_binary,
@@ -84,6 +90,7 @@ The `lipo` tool is used to combine built binaries of multiple architectures.
 """,
     implementation = _apple_universal_binary_impl,
     attrs = [
+        apple_support.platform_constraint_attrs(),
         rule_attrs.common_attrs(),
         rule_attrs.platform_attrs(),
         {

apple/internal/macos_rules.bzl

@@ -2109,9 +2109,15 @@ def _macos_command_line_application_impl(ctx):
 
     return [
         new_applebinaryinfo(
+            archs = sorted([
+                x[ApplePlatformInfo].target_arch
+                for x in cc_toolchain_forwarder.values()
+            ]),
             binary = output_file,
             infoplist = infoplist,
+            platform_type = platform_prerequisites.platform_type,
             product_type = rule_descriptor.product_type,
+            target_environment = platform_prerequisites.target_environment,
         ),
         DefaultInfo(
             executable = output_file,
@@ -2250,9 +2256,15 @@ def _macos_dylib_impl(ctx):
 
     return [
         new_applebinaryinfo(
+            archs = sorted([
+                x[ApplePlatformInfo].target_arch
+                for x in cc_toolchain_forwarder.values()
+            ]),
             binary = output_file,
             infoplist = infoplist,
+            platform_type = platform_prerequisites.platform_type,
             product_type = rule_descriptor.product_type,
+            target_environment = platform_prerequisites.target_environment,
         ),
         DefaultInfo(files = depset(transitive = [
             depset([output_file]),

apple/internal/providers.bzl

@@ -66,15 +66,26 @@ This provider propagates general information about an Apple binary that is not
 specific to any particular binary type.
 """,
     fields = {
+        "archs": """
+`List` of `String`s. The architectures that the binary supports (i.e. `arm64` for Apple Silicon
+simulators and device builds).
+""",
         "binary": """
 `File`. The binary (executable, dynamic library, etc.) file that the target represents.
 """,
         "infoplist": """
 `File`. The complete (binary-formatted) `Info.plist` embedded in the binary.
+""",
+        "platform_type": """
+`String`. The platform type for the binary (i.e. `ios` for iOS binaries).
 """,
         "product_type": """
 `String`. The dot-separated product type identifier associated with the binary (for example,
 `com.apple.product-type.tool`).
+""",
+        "target_environment": """
+`String`. The environment that the binary was built for, (i.e. `device` for iOS device builds,
+`simulator` for iOS simulator builds).
 """,
     },
     init = _make_banned_init(provider_name = "AppleBinaryInfo"),