Add Watch and TV to list of platforms.

-- MOS_MIGRATED_REVID=115577068
s-pace · Feb 26, 2016 · e75e18c · e75e18c
1 parent 63e8d63
commit e75e18c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
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
@@ -128,7 +128,7 @@ public static String sdkFrameworkDir(Platform targetPlatform,
           relativePath = DEVELOPER_FRAMEWORK_PATH;
         }
         break;
-      case MACOSX:
+      case MACOS_X:
         relativePath = DEVELOPER_FRAMEWORK_PATH;
         break;
       default:

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
@@ -28,7 +28,11 @@
 public enum Platform {
   IOS_DEVICE("iPhoneOS"),
   IOS_SIMULATOR("iPhoneSimulator"),
-  MACOSX("MacOSX");
+  MACOS_X("MacOSX"),
+  TVOS_DEVICE("AppleTVOS"),
+  TVOS_SIMULATOR("AppleTVSimulator"),
+  WATCHOS_DEVICE("WatchOS"),
+  WATCHOS_SIMULATOR("WatchSimulator");
 
   private static final Set<String> IOS_SIMULATOR_ARCHS = ImmutableSet.of("i386", "x86_64");
   private static final Set<String> IOS_DEVICE_ARCHS =
@@ -89,7 +93,7 @@ private static Platform forTargetCpuNullable(String targetCpu) {
     } else if (IOS_DEVICE_TARGET_CPUS.contains(targetCpu)) {
       return IOS_DEVICE;
     } else if (MACOSX_TARGET_CPUS.contains(targetCpu)) {
-      return MACOSX;
+      return MACOS_X;
     } else {
       return null;
     }