Update DEFAULT_IOS_CPU for M1 arm64 simulator support Now that bazel supports ios_sim_arm64 we can prefer this if no other iOS CPU is passed so that developers can build the simulator builds of their apps / tests without having to pass a flag depending on the host. Closes #13873. PiperOrigin-RevId: 405661296
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 4d92a57..a7a8a3e 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
@@ -34,6 +34,7 @@ import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions.AppleBitcodeMode; import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType; import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleConfigurationApi; +import com.google.devtools.build.lib.util.CPU; import java.util.ArrayList; import java.util.Arrays; import java.util.EnumMap; @@ -77,7 +78,8 @@ public static final String IOS_FORCED_SIMULATOR_CPU_PREFIX = "sim_"; /** Default cpu for iOS builds. */ - @VisibleForTesting static final String DEFAULT_IOS_CPU = "x86_64"; + @VisibleForTesting + static final String DEFAULT_IOS_CPU = CPU.getCurrent() == CPU.AARCH64 ? "sim_arm64" : "x86_64"; private final PlatformType applePlatformType; private final ConfigurationDistinguisher configurationDistinguisher;