From f1daf418da02f27d5a2e7ddd751d4590289015c9 Mon Sep 17 00:00:00 2001
From: Nicholas Levin <nglevin@google.com>
Date: Tue, 18 Jul 2023 12:17:06 -0700
Subject: [PATCH] Switch the tvOS Apple BUILD rules and tests to the Starlark
 Apple split transition.

PiperOrigin-RevId: 549075405
---
 apple/internal/testing/BUILD                |  1 +
 apple/internal/testing/build_test_rules.bzl |  2 +-
 apple/internal/testing/tvos_rules.bzl       |  8 ++++++--
 apple/internal/tvos_rules.bzl               | 10 +++++-----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apple/internal/testing/BUILD b/apple/internal/testing/BUILD
index ceffff0ba2..e6b3569c5c 100644
--- a/apple/internal/testing/BUILD
+++ b/apple/internal/testing/BUILD
@@ -121,6 +121,7 @@ bzl_library(
         "//apple/internal:providers",
         "//apple/internal:rule_attrs",
         "//apple/internal:rule_factory",
+        "//apple/internal:transition_support",
         "//apple/internal/aspects:framework_provider_aspect",
         "//apple/internal/aspects:resource_aspect",
     ],
diff --git a/apple/internal/testing/build_test_rules.bzl b/apple/internal/testing/build_test_rules.bzl
index 5f51456c45..eedc115422 100644
--- a/apple/internal/testing/build_test_rules.bzl
+++ b/apple/internal/testing/build_test_rules.bzl
@@ -64,7 +64,7 @@ def apple_build_test_rule(doc, platform_type):
         The created `rule`.
     """
     targets_cfg = apple_common.multi_arch_split
-    if platform_type == "watchos":
+    if platform_type == "tvos" or platform_type == "watchos":
         targets_cfg = transition_support.apple_platform_split_transition
 
     # TODO(b/161808913): Once resource processing actions have all been moved
diff --git a/apple/internal/testing/tvos_rules.bzl b/apple/internal/testing/tvos_rules.bzl
index f0978c10b9..963046ebd8 100644
--- a/apple/internal/testing/tvos_rules.bzl
+++ b/apple/internal/testing/tvos_rules.bzl
@@ -42,6 +42,10 @@ load(
     "@build_bazel_rules_apple//apple/internal:rule_factory.bzl",
     "rule_factory",
 )
+load(
+    "@build_bazel_rules_apple//apple/internal:transition_support.bzl",
+    "transition_support",
+)
 load(
     "@build_bazel_rules_apple//apple/internal/aspects:framework_provider_aspect.bzl",
     "framework_provider_aspect",
@@ -98,7 +102,7 @@ _tvos_internal_ui_test_bundle = rule_factory.create_apple_rule(
     predeclared_outputs = {"archive": "%{name}.zip"},
     attrs = [
         rule_attrs.binary_linking_attrs(
-            deps_cfg = apple_common.multi_arch_split,
+            deps_cfg = transition_support.apple_platform_split_transition,
             extra_deps_aspects = [
                 apple_resource_aspect,
                 framework_provider_aspect,
@@ -158,7 +162,7 @@ _tvos_internal_unit_test_bundle = rule_factory.create_apple_rule(
     predeclared_outputs = {"archive": "%{name}.zip"},
     attrs = [
         rule_attrs.binary_linking_attrs(
-            deps_cfg = apple_common.multi_arch_split,
+            deps_cfg = transition_support.apple_platform_split_transition,
             extra_deps_aspects = [
                 apple_resource_aspect,
                 framework_provider_aspect,
diff --git a/apple/internal/tvos_rules.bzl b/apple/internal/tvos_rules.bzl
index 00d1924d7d..dfe3b01815 100644
--- a/apple/internal/tvos_rules.bzl
+++ b/apple/internal/tvos_rules.bzl
@@ -1020,10 +1020,10 @@ tvos_application = rule_factory.create_apple_rule(
     attrs = [
         rule_attrs.app_icon_attrs(),
         rule_attrs.app_intents_attrs(
-            deps_cfg = apple_common.multi_arch_split,
+            deps_cfg = transition_support.apple_platform_split_transition,
         ),
         rule_attrs.binary_linking_attrs(
-            deps_cfg = apple_common.multi_arch_split,
+            deps_cfg = transition_support.apple_platform_split_transition,
             extra_deps_aspects = [
                 apple_resource_aspect,
                 framework_provider_aspect,
@@ -1032,7 +1032,7 @@ tvos_application = rule_factory.create_apple_rule(
             requires_legacy_cc_toolchain = True,
         ),
         rule_attrs.cc_toolchain_forwarder_attrs(
-            deps_cfg = apple_common.multi_arch_split,
+            deps_cfg = transition_support.apple_platform_split_transition,
         ),
         rule_attrs.common_bundle_attrs(),
         rule_attrs.common_tool_attrs(),
@@ -1081,7 +1081,7 @@ tvos_extension = rule_factory.create_apple_rule(
     predeclared_outputs = {"archive": "%{name}.zip"},
     attrs = [
         rule_attrs.binary_linking_attrs(
-            deps_cfg = apple_common.multi_arch_split,
+            deps_cfg = transition_support.apple_platform_split_transition,
             extra_deps_aspects = [
                 apple_resource_aspect,
                 framework_provider_aspect,
@@ -1122,7 +1122,7 @@ tvos_framework = rule_factory.create_apple_rule(
     predeclared_outputs = {"archive": "%{name}.zip"},
     attrs = [
         rule_attrs.binary_linking_attrs(
-            deps_cfg = apple_common.multi_arch_split,
+            deps_cfg = transition_support.apple_platform_split_transition,
             extra_deps_aspects = [
                 apple_resource_aspect,
                 framework_provider_aspect,