Add support for new arm64e iOS Device architecture.

RELNOTES: None PiperOrigin-RevId: 229807657
weixiao-huang · Jan 31, 2019 · 1c6e606 · 1c6e606
1 parent 503cdb0
commit 1c6e606
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java b/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
@@ -43,7 +43,7 @@ public enum ApplePlatform implements ApplePlatformApi {
   private static final ImmutableSet<String> IOS_SIMULATOR_TARGET_CPUS =
       ImmutableSet.of("ios_x86_64", "ios_i386");
   private static final ImmutableSet<String> IOS_DEVICE_TARGET_CPUS =
-      ImmutableSet.of("ios_armv6", "ios_arm64", "ios_armv7", "ios_armv7s");
+      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");
   private static final ImmutableSet<String> WATCHOS_DEVICE_TARGET_CPUS =

diff --git a/tools/osx/crosstool/osx_archs.bzl b/tools/osx/crosstool/osx_archs.bzl
@@ -27,6 +27,7 @@ OSX_TOOLS_ARCHS = [
     "armeabi-v7a",
     "ios_armv7",
     "ios_arm64",
+    "ios_arm64e",
     "watchos_armv7k",
     "watchos_arm64_32",
     "tvos_arm64",