Add support for ios_sim_arm64 CPU type

src/TulsiGenerator/DeploymentTarget.swift

@@ -23,8 +23,9 @@ public enum CPU: String {
   case arm64
   case arm64e
   case arm64_32
+  case sim_arm64
 
-  public static let allCases: [CPU] = [.i386, .x86_64, .armv7, .armv7k, .arm64, .arm64e, .arm64_32]
+  public static let allCases: [CPU] = [.i386, .x86_64, .armv7, .armv7k, .arm64, .arm64e, .arm64_32, .sim_arm64]
 
   var isARM: Bool {
     switch self {
@@ -35,6 +36,7 @@ public enum CPU: String {
     case .arm64: return true
     case .arm64e: return true
     case .arm64_32: return true
+    case .sim_arm64: return true
     }
   }
 
@@ -113,7 +115,7 @@ public enum PlatformType: String {
 
   var validCPUs: Set<CPU> {
     switch self {
-    case .ios: return [.i386, .x86_64, .armv7, .arm64, .arm64e]
+    case .ios: return [.i386, .x86_64, .armv7, .arm64, .arm64e, .sim_arm64]
     case .macos: return  [.x86_64, .arm64, .arm64e]
     case .tvos: return [.x86_64, .arm64]
     case .watchos: return [.i386, .x86_64, .armv7k, .arm64_32]

src/TulsiGenerator/Scripts/bazel_build.py

@@ -456,16 +456,6 @@ def __init__(self, build_settings):
 
     self.update_symbol_cache = UpdateSymbolCache()
 
-    # Target architecture.  Must be defined for correct setting of
-    # the --cpu flag. Note that Xcode will set multiple values in
-    # ARCHS when building for a Generic Device.
-    archs = os.environ.get('ARCHS')
-    if not archs:
-      _PrintXcodeError('Tulsi requires env variable ARCHS to be '
-                       'set.  Please file a bug against Tulsi.')
-      sys.exit(1)
-    self.arch = archs.split()[-1]
-
     # Path into which generated artifacts should be copied.
     self.built_products_dir = os.environ['BUILT_PRODUCTS_DIR']
     # Path where Xcode expects generated sources to be placed.
@@ -521,6 +511,20 @@ def __init__(self, build_settings):
     else:
       self.codesigning_allowed = os.environ.get('CODE_SIGNING_ALLOWED') == 'YES'
 
+    # Target architecture.  Must be defined for correct setting of
+    # the --cpu flag. Note that Xcode will set multiple values in
+    # ARCHS when building for a Generic Device.
+    archs = os.environ.get('ARCHS')
+    if not archs:
+      _PrintXcodeError('Tulsi requires env variable ARCHS to be '
+                       'set.  Please file a bug against Tulsi.')
+      sys.exit(1)
+    arch = archs.split()[-1]
+    if self.is_simulator and arch == "arm64":
+      self.arch = "sim_" + arch
+    else:
+      self.arch = arch
+
     if self.codesigning_allowed:
       platform_prefix = 'iOS'
       if self.platform_name.startswith('macos'):