SplitTransitionProvider no longer requires the attributes it uses are "Non Configurable"

RELNOTES: None.
PiperOrigin-RevId: 171751391

2 files changed, 32 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
index 70ffa8f573..6d259f4b1a 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
@@ -301,7 +301,7 @@ public class AttributeTest {
 
   private static class TestSplitTransitionProvider implements SplitTransitionProvider {
     @Override
-    public SplitTransition<?> apply(Rule fromRule) {
+    public SplitTransition<?> apply(ConfiguredAttributeMapper attrMapper) {
       return new TestSplitTransition();
     }
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
index 698f33423c..33c5e26218 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
@@ -1119,6 +1119,37 @@ public class AppleBinaryTest extends ObjcRuleTestCase {
         getGeneratingAction(arm64ProtoObjcSource).getInputs(), "two.proto")).isNotNull();
   }
 
+  @Test
+  public void testPlatformTypeIsConfigurable() throws Exception {
+    scratch.file(
+        "examples/BUILD",
+        "package(default_visibility = ['//visibility:public'])",
+        "apple_binary(",
+        "    name = 'bin',",
+        "    deps = [':objc_lib'],",
+        "    platform_type = select({",
+        "        ':watch_setting': 'watchos',",
+        "        '//conditions:default': 'ios',",
+        "    }),",
+        ")",
+        "objc_library(",
+        "    name = 'objc_lib',",
+        "    srcs = ['a.m'],",
+        ")",
+        "config_setting(",
+        "    name = 'watch_setting',",
+        "    values = {'define': 'use_watch=1'},",
+        ")");
+
+    useConfiguration("--define=use_watch=1",
+        "--ios_multi_cpus=armv7,arm64",
+        "--watchos_cpus=armv7k");
+
+    Action lipoAction = actionProducingArtifact("//examples:bin", "_lipobin");
+
+    assertThat(getSingleArchBinary(lipoAction, "armv7k")).isNotNull();
+  }
+
   private SkylarkDict<String, SkylarkDict<String, Artifact>>
       generateAppleDebugOutputsSkylarkProviderMap() throws Exception {
     scratch.file("examples/rule/BUILD");