From 03bda9951826eb4d1a9c11ea956970fa1041ce4c Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Thu, 28 Oct 2021 03:21:24 -0700 Subject: [PATCH] Update DEFAULT_IOS_CPU for M1 arm64 simulator support (#14182) 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 (cherry picked from commit d7628e1b566be353fe7172241ac8f15d5f8e7ff5) --- .../devtools/build/lib/rules/apple/AppleConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 13bc7fa4fcaad3..bcab7f43f70194 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 @@ -32,6 +32,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; @@ -68,7 +69,8 @@ public class AppleConfiguration extends Fragment implements AppleConfigurationAp 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;