Create new watchos_device_arm64 architecture

PiperOrigin-RevId: 478612896
Change-Id: Ice91d2382dc971ebada6efe0be71cdfdb8f2ff69

Author: Googler

src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java

@@ -75,9 +75,11 @@ public class AppleConfiguration extends Fragment implements AppleConfigurationAp
   /** Prefix for macOS cpu values */
   private static final String MACOS_CPU_PREFIX = "darwin_";
 
-  // TODO(b/180572694): Remove after platforms based toolchain resolution supported.
-  /** Prefix for forced iOS and tvOS simulator cpu values */
-  public static final String FORCED_SIMULATOR_CPU_PREFIX = "sim_";
+  /** Prefix for simulator environment cpu values */
+  public static final String SIMULATOR_ENVIRONMENT_CPU_PREFIX = "sim_";
+
+  /** Prefix for device environment cpu values */
+  public static final String DEVICE_ENVIRONMENT_CPU_PREFIX = "device_";
 
   /** Default cpu for iOS builds. */
   @VisibleForTesting
@@ -222,21 +224,19 @@ public static ImmutableMap<String, String> getXcodeVersionEnv(DottedVersion xcod
    */
   @Override
   public String getSingleArchitecture() {
-    return getSingleArchitecture(applePlatformType, appleCpus, /* removeSimPrefix= */ true);
+    return getSingleArchitecture(applePlatformType, appleCpus, /* removeEnvironmentPrefix= */ true);
   }
 
   private static String getSingleArchitecture(
-      PlatformType applePlatformType, AppleCpus appleCpus, boolean removeSimPrefix) {
-    // The removeSimPrefix argument is necessary due to a simulator and device both using arm64
-    // architecture. In the case of Starlark asking for the architecture, we should return the
-    // actual architecture (arm64) but in other cases in this class what we actually want is the
-    // CPU without the ios/tvos prefix (e.g. sim_arm64). This parameter is provided in the private
-    // method so that internal to this class we are able to use both without duplicating retrieval
-    // logic.
-    // TODO(b/180572694): Remove removeSimPrefix parameter once platforms are used instead of CPU
+      PlatformType applePlatformType, AppleCpus appleCpus, boolean removeEnvironmentPrefix) {
+    // The removeEnvironmentPrefix argument is used to remove the environment data from the CPU
+    // - e.g. whether the target CPU is for simulator, device or catalyst. For older CPUs,
+    // no environment may be provided.
     String cpu = getPrefixedAppleCpu(applePlatformType, appleCpus);
-    if (removeSimPrefix && cpu.startsWith(FORCED_SIMULATOR_CPU_PREFIX)) {
-      cpu = cpu.substring(FORCED_SIMULATOR_CPU_PREFIX.length());
+    if (removeEnvironmentPrefix && cpu.startsWith(SIMULATOR_ENVIRONMENT_CPU_PREFIX)) {
+      cpu = cpu.substring(SIMULATOR_ENVIRONMENT_CPU_PREFIX.length());
+    } else if (removeEnvironmentPrefix && cpu.startsWith(DEVICE_ENVIRONMENT_CPU_PREFIX)) {
+      cpu = cpu.substring(DEVICE_ENVIRONMENT_CPU_PREFIX.length());
     }
     return cpu;
   }
@@ -319,7 +319,7 @@ public List<String> getMultiArchitectures(PlatformType platformType) {
   public ApplePlatform getSingleArchPlatform() {
     return ApplePlatform.forTarget(
         applePlatformType,
-        getSingleArchitecture(applePlatformType, appleCpus, /* removeSimPrefix= */ false));
+        getSingleArchitecture(applePlatformType, appleCpus, /* removeEnvironmentPrefix= */ false));
   }
 
   /**
@@ -384,7 +384,7 @@ public static AppleBitcodeMode getAppleBitcodeMode(
       AppleCpus appleCpus,
       EnumMap<ApplePlatform.PlatformType, AppleBitcodeMode> platformBitcodeModes) {
     String architecture =
-        getSingleArchitecture(applePlatformType, appleCpus, /* removeSimPrefix= */ false);
+        getSingleArchitecture(applePlatformType, appleCpus, /* removeEnvironmentPrefix= */ false);
     String cpuString = ApplePlatform.cpuStringForTarget(applePlatformType, architecture);
     if (ApplePlatform.isApplePlatform(cpuString)) {
       ApplePlatform platform = ApplePlatform.forTarget(applePlatformType, architecture);

src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java

@@ -41,15 +41,14 @@ public enum ApplePlatform implements ApplePlatformApi {
   WATCHOS_SIMULATOR("watchos_simulator", "WatchSimulator", PlatformType.WATCHOS, false),
   CATALYST("catalyst", "MacOSX", PlatformType.CATALYST, true);
 
-  // TODO(b/180572694): Remove ios_sim_arm64 after platforms based toolchain resolution supported.
   private static final ImmutableSet<String> IOS_SIMULATOR_TARGET_CPUS =
       ImmutableSet.of("ios_x86_64", "ios_i386", "ios_sim_arm64");
   private static final ImmutableSet<String> IOS_DEVICE_TARGET_CPUS =
       ImmutableSet.of("ios_armv6", "ios_arm64", "ios_armv7", "ios_armv7s", "ios_arm64e");
   private static final ImmutableSet<String> WATCHOS_SIMULATOR_TARGET_CPUS =
       ImmutableSet.of("watchos_i386", "watchos_x86_64", "watchos_arm64");
   private static final ImmutableSet<String> WATCHOS_DEVICE_TARGET_CPUS =
-      ImmutableSet.of("watchos_armv7k", "watchos_arm64_32");
+      ImmutableSet.of("watchos_armv7k", "watchos_arm64_32", "watchos_device_arm64");
   private static final ImmutableSet<String> TVOS_SIMULATOR_TARGET_CPUS =
       ImmutableSet.of("tvos_x86_64", "tvos_sim_arm64");
   private static final ImmutableSet<String> TVOS_DEVICE_TARGET_CPUS =