Platform -> ApplePlatform, to avoid ambiguity with the newly introduced

Platform rule.

PiperOrigin-RevId: 161203491

6 files changed, 45 insertions, 42 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStubBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStubBinaryTest.java
index d1927fd53d..b6c5d09933 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStubBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStubBinaryTest.java
@@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.CommandAction;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
-import com.google.devtools.build.lib.rules.apple.Platform.PlatformType;
+import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType;
 import com.google.devtools.build.lib.testutil.Scratch;
 import java.io.IOException;
 import java.util.Set;
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcBinaryTest.java
index c40d547be3..298f704d13 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcBinaryTest.java
@@ -26,8 +26,8 @@ import com.google.devtools.build.lib.actions.CommandAction;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter;
 import com.google.devtools.build.lib.packages.util.MockObjcSupport;
+import com.google.devtools.build.lib.rules.apple.ApplePlatform;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
-import com.google.devtools.build.lib.rules.apple.Platform;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.rules.cpp.CppLinkAction;
 import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode;
@@ -78,7 +78,7 @@ public class ExperimentalObjcBinaryTest extends ObjcRuleTestCase {
         "--experimental_disable_go",
         "--cpu=ios_armv7",
         "--ios_cpu=armv7");
-    Platform platform = Platform.IOS_DEVICE;
+    ApplePlatform platform = ApplePlatform.IOS_DEVICE;
 
     addMockBinAndLibs(ImmutableList.of("a.m"));
     CommandAction action = linkAction("//bin:bin");
@@ -128,7 +128,7 @@ public class ExperimentalObjcBinaryTest extends ObjcRuleTestCase {
         "--experimental_disable_go",
         "--cpu=ios_x86_64",
         "--ios_cpu=x86_64");
-    Platform platform = Platform.IOS_SIMULATOR;
+    ApplePlatform platform = ApplePlatform.IOS_SIMULATOR;
 
     addMockBinAndLibs(ImmutableList.of("a.m"));
     CommandAction action = linkAction("//bin:bin");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java
index 3d931b961b..4305790dca 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java
@@ -35,8 +35,8 @@ import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
 import com.google.devtools.build.lib.packages.util.MockObjcSupport;
+import com.google.devtools.build.lib.rules.apple.ApplePlatform;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
-import com.google.devtools.build.lib.rules.apple.Platform;
 import com.google.devtools.build.lib.rules.cpp.HeaderDiscovery;
 import com.google.devtools.build.lib.rules.cpp.LinkerInput;
 import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode;
@@ -111,7 +111,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest {
   @Test
   public void testCompilationActions_simulator() throws Exception {
     useConfiguration("--cpu=ios_i386", "--ios_minimum_os=1.0");
-    Platform platform = Platform.IOS_SIMULATOR;
+    ApplePlatform platform = ApplePlatform.IOS_SIMULATOR;
     createLibraryTargetWriter("//objc:lib")
         .setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
         .setAndCreateFiles("hdrs", "c.h")
@@ -176,7 +176,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest {
   @Test
   public void testCompilationActions_device() throws Exception {
     useConfiguration("--cpu=ios_armv7", "--ios_minimum_os=1.0");
-    Platform platform = Platform.IOS_DEVICE;
+    ApplePlatform platform = ApplePlatform.IOS_DEVICE;
 
     createLibraryTargetWriter("//objc:lib")
         .setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
@@ -251,7 +251,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest {
 
   @Test
   public void testCompilationActionsWithPch() throws Exception {
-    Platform platform = Platform.IOS_SIMULATOR;
+    ApplePlatform platform = ApplePlatform.IOS_SIMULATOR;
     scratch.file("objc/foo.pch");
     createLibraryTargetWriter("//objc:lib")
         .setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
@@ -298,7 +298,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest {
   @Test
   public void testCompilationActionsWithCopts() throws Exception {
     useConfiguration("--cpu=ios_i386");
-    Platform platform = Platform.IOS_SIMULATOR;
+    ApplePlatform platform = ApplePlatform.IOS_SIMULATOR;
     createLibraryTargetWriter("//objc:lib")
         .setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
         .setAndCreateFiles("hdrs", "c.h")
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java
index ff99cefb5e..dc45294c3e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java
@@ -21,8 +21,8 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.CommandAction;
 import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
+import com.google.devtools.build.lib.rules.apple.ApplePlatform;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
-import com.google.devtools.build.lib.rules.apple.Platform;
 import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,7 +41,7 @@ public class LegacyObjcProtoLibraryTest extends ObjcProtoLibraryTest {
   @Test
   public void testCompilationAction() throws Exception {
     useConfiguration("--cpu=ios_i386");
-    Platform platform = Platform.IOS_SIMULATOR;
+    ApplePlatform platform = ApplePlatform.IOS_SIMULATOR;
 
     ConfiguredTarget target = getConfiguredTarget("//package:opl");
     CommandAction linkAction =
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
index 40a2c83edc..9840d460a6 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
@@ -46,8 +46,8 @@ import com.google.devtools.build.lib.analysis.config.CompilationMode;
 import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter;
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
 import com.google.devtools.build.lib.packages.util.MockObjcSupport;
+import com.google.devtools.build.lib.rules.apple.ApplePlatform;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
-import com.google.devtools.build.lib.rules.apple.Platform;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.rules.cpp.CppModuleMapAction;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -412,8 +412,10 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
         .containsAllOf("-isysroot", AppleToolchain.sdkDir()).inOrder();
     assertThat(Collections.frequency(compileActionA.getArguments(),
         "-F" + AppleToolchain.sdkDir() + "/Developer/Library/Frameworks")).isEqualTo(1);
-    assertThat(Collections.frequency(compileActionA.getArguments(),
-        "-F" + frameworkDir(Platform.IOS_SIMULATOR))).isEqualTo(1);
+    assertThat(
+            Collections.frequency(
+                compileActionA.getArguments(), "-F" + frameworkDir(ApplePlatform.IOS_SIMULATOR)))
+        .isEqualTo(1);
     assertThat(compileActionA.getArguments())
         .containsAllIn(AppleToolchain.DEFAULT_WARNINGS.values());
     assertThat(compileActionA.getArguments())
@@ -463,8 +465,10 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
         .containsAllOf("-isysroot", AppleToolchain.sdkDir()).inOrder();
     assertThat(Collections.frequency(compileActionA.getArguments(),
         "-F" + AppleToolchain.sdkDir() + "/Developer/Library/Frameworks")).isEqualTo(1);
-    assertThat(Collections.frequency(compileActionA.getArguments(),
-        "-F" + frameworkDir(Platform.IOS_DEVICE))).isEqualTo(1);
+    assertThat(
+            Collections.frequency(
+                compileActionA.getArguments(), "-F" + frameworkDir(ApplePlatform.IOS_DEVICE)))
+        .isEqualTo(1);
     assertThat(compileActionA.getArguments())
         .containsAllIn(AppleToolchain.DEFAULT_WARNINGS.values());
     assertThat(compileActionA.getArguments())
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index 1224433700..75e3d9c07e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -84,10 +84,10 @@ import com.google.devtools.build.lib.packages.util.MockProtoSupport;
 import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions;
 import com.google.devtools.build.lib.rules.apple.AppleConfiguration;
 import com.google.devtools.build.lib.rules.apple.AppleConfiguration.ConfigurationDistinguisher;
+import com.google.devtools.build.lib.rules.apple.ApplePlatform;
+import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.apple.DottedVersion;
-import com.google.devtools.build.lib.rules.apple.Platform;
-import com.google.devtools.build.lib.rules.apple.Platform.PlatformType;
 import com.google.devtools.build.lib.rules.apple.XcodeVersionProperties;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.rules.cpp.CppLinkAction;
@@ -292,7 +292,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
     return frameworkDir(configuration.getSingleArchPlatform());
   }
 
-  protected static String frameworkDir(Platform platform) {
+  protected static String frameworkDir(ApplePlatform platform) {
     return AppleToolchain.platformDir(
         platform.getNameInPlist()) + AppleToolchain.DEVELOPER_FRAMEWORK_PATH;
   }
@@ -578,29 +578,28 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
       frameworkPathBaseNames.add(importedFramework.getBaseName());
     }
 
-    ImmutableList<String> expectedCommandLineFragments = ImmutableList.<String>builder()
-        .add("-mios-simulator-version-min=" + DEFAULT_IOS_SDK_VERSION)
-        .add("-arch " + arch)
-        .add("-isysroot " + AppleToolchain.sdkDir())
-        .add(AppleToolchain.sdkDir() + AppleToolchain.DEVELOPER_FRAMEWORK_PATH)
-        .add(frameworkDir(Platform.forTarget(PlatformType.IOS, arch)))
-        .addAll(frameworkPathFragmentParents.build())
-        .add("-Xlinker -objc_abi_version -Xlinker 2")
-        .add("-Xlinker -rpath -Xlinker @executable_path/Frameworks")
-        .add("-fobjc-link-runtime")
-        .add("-ObjC")
-        .addAll(
-            Interspersing.beforeEach(
-            "-framework", SdkFramework.names(AUTOMATIC_SDK_FRAMEWORKS)))
-        .addAll(
-            Interspersing.beforeEach(
-                "-framework", frameworkPathBaseNames.build()))
-        .add("-filelist")
-        .add(filelistArtifact.getExecPathString())
-        .add("-o")
-        .addAll(Artifact.toExecPaths(binAction.getOutputs()))
-        .addAll(extraLinkArgs)
-        .build();
+    ImmutableList<String> expectedCommandLineFragments =
+        ImmutableList.<String>builder()
+            .add("-mios-simulator-version-min=" + DEFAULT_IOS_SDK_VERSION)
+            .add("-arch " + arch)
+            .add("-isysroot " + AppleToolchain.sdkDir())
+            .add(AppleToolchain.sdkDir() + AppleToolchain.DEVELOPER_FRAMEWORK_PATH)
+            .add(frameworkDir(ApplePlatform.forTarget(PlatformType.IOS, arch)))
+            .addAll(frameworkPathFragmentParents.build())
+            .add("-Xlinker -objc_abi_version -Xlinker 2")
+            .add("-Xlinker -rpath -Xlinker @executable_path/Frameworks")
+            .add("-fobjc-link-runtime")
+            .add("-ObjC")
+            .addAll(
+                Interspersing.beforeEach(
+                    "-framework", SdkFramework.names(AUTOMATIC_SDK_FRAMEWORKS)))
+            .addAll(Interspersing.beforeEach("-framework", frameworkPathBaseNames.build()))
+            .add("-filelist")
+            .add(filelistArtifact.getExecPathString())
+            .add("-o")
+            .addAll(Artifact.toExecPaths(binAction.getOutputs()))
+            .addAll(extraLinkArgs)
+            .build();
 
     String linkArgs = Joiner.on(" ").join(binAction.getArguments());
     for (String expectedCommandLineFragment : expectedCommandLineFragments) {