Rename Platform.forArch to Platform.forIosArch, as it is truly doing the latter.

--
MOS_MIGRATED_REVID=108057030

6 files changed, 18 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
index e53f335a61..e1728b866b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
@@ -81,11 +81,11 @@ public class AppleCommandLineOptions extends FragmentOptions {
 
   private Platform getPlatform() {
     for (String architecture : iosMultiCpus) {
-      if (Platform.forArch(architecture) == Platform.IOS_DEVICE) {
+      if (Platform.forIosArch(architecture) == Platform.IOS_DEVICE) {
         return Platform.IOS_DEVICE;
       }
     }
-    return Platform.forArch(iosCpu);
+    return Platform.forIosArch(iosCpu);
   }
   
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
index e7dbcbfa6b..20ae377d96 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
@@ -92,7 +92,7 @@ public class AppleConfiguration extends BuildConfiguration.Fragment {
       builder.put(XCODE_VERSION_ENV_NAME, xcodeVersionOverride.get());
     }
     builder.put(APPLE_SDK_VERSION_ENV_NAME, iosSdkVersion);
-    builder.put(APPLE_SDK_PLATFORM_ENV_NAME, Platform.forArch(getIosCpu()).getNameInPlist());
+    builder.put(APPLE_SDK_PLATFORM_ENV_NAME, Platform.forIosArch(getIosCpu()).getNameInPlist());
     return builder.build();
   }
   
@@ -114,11 +114,11 @@ public class AppleConfiguration extends BuildConfiguration.Fragment {
   // (in particular actool, bundlemerge, momc) have been upgraded to support multiple values.
   public Platform getBundlingPlatform() {
     for (String architecture : getIosMultiCpus()) {
-      if (Platform.forArch(architecture) == Platform.IOS_DEVICE) {
+      if (Platform.forIosArch(architecture) == Platform.IOS_DEVICE) {
         return Platform.IOS_DEVICE;
       }
     }
-    return Platform.forArch(getIosCpu());
+    return Platform.forIosArch(getIosCpu());
   }
   
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java
index 0c6fcfc484..19693a9973 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java
@@ -61,7 +61,7 @@ public class AppleToolchain {
    */
   // TODO(bazel-team): Support non-ios platforms.
   public static String getPlatformPlistName(AppleConfiguration configuration) {
-    return Platform.forArch(configuration.getIosCpu()).getNameInPlist();
+    return Platform.forIosArch(configuration.getIosCpu()).getNameInPlist();
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/Platform.java b/src/main/java/com/google/devtools/build/lib/rules/apple/Platform.java
index 4871fd8875..e5b447e327 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/Platform.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/Platform.java
@@ -52,19 +52,22 @@ public enum Platform {
   }
 
   /**
-   * Returns the platform for the architecture.
+   * Returns the iOS platform for the given iOS architecture.
+   *
+   * <p>If this method is used in non-iOS contexts, results are undefined. If the input happens
+   * to share an architecture with some iOS platform, this will return that platform even if it is
+   * incorrect (for example, IOS_SIMULATOR for the x86_64 of darwin_x86_64).
    * 
-   * @throws IllegalArgumentException if there is no valid apple platform for the given
-   *     architecture
+   * @throws IllegalArgumentException if there is no valid ios platform for the given architecture
    */
-  public static Platform forArch(String arch) {
+  public static Platform forIosArch(String arch) {
     if (IOS_SIMULATOR_ARCHS.contains(arch)) {
       return IOS_SIMULATOR;
     } else if (IOS_DEVICE_ARCHS.contains(arch)) {
       return IOS_DEVICE;
     } else {
       throw new IllegalArgumentException(
-          "No supported apple platform registered for architecture " + arch);
+          "No supported ios platform registered for architecture " + arch);
     }
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
index 362dc7106e..f9080a3381 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
@@ -134,8 +134,8 @@ final class BundleSupport {
     Platform platform = null;
     for (String architecture : appleConfiguration.getIosMultiCpus()) {
       if (platform == null) {
-        platform = Platform.forArch(architecture);
-      } else if (platform != Platform.forArch(architecture)) {
+        platform = Platform.forIosArch(architecture);
+      } else if (platform != Platform.forIosArch(architecture)) {
         ruleContext.ruleError(
             String.format("In builds which require bundling, --ios_multi_cpus does not currently "
                 + "allow values for both simulator and device builds. Flag was %s",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index 322e4e158a..40260085e1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -1306,7 +1306,7 @@ public final class CompilationSupport {
       ObjcProvider provider, ObjcConfiguration objcConfiguration,
       AppleConfiguration appleConfiguration) {
     ImmutableList.Builder<String> builder = new ImmutableList.Builder<>();
-    if (Platform.forArch(appleConfiguration.getIosCpu()) == Platform.IOS_SIMULATOR) {
+    if (Platform.forIosArch(appleConfiguration.getIosCpu()) == Platform.IOS_SIMULATOR) {
       builder.add("-mios-simulator-version-min=" + objcConfiguration.getMinimumOs());
     } else {
       builder.add("-miphoneos-version-min=" + objcConfiguration.getMinimumOs());
@@ -1341,7 +1341,7 @@ public final class CompilationSupport {
 
   private static List<String> platformSpecificCompileFlagsForClang(
       AppleConfiguration configuration) {
-    switch (Platform.forArch(configuration.getIosCpu())) {
+    switch (Platform.forIosArch(configuration.getIosCpu())) {
       case IOS_DEVICE:
         return ImmutableList.of();
       case IOS_SIMULATOR: