updates

bazelbuild · Feb 23, 2024 · 02265c2 · 02265c2
1 parent 0af0279
commit 02265c2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/platform_mappings b/platform_mappings
@@ -75,6 +75,14 @@ platforms:
     --apple_platform_type=watchos
     --cpu=watchos_arm64_32
 
+  @build_bazel_apple_support//platforms:watchos_device_arm64
+    --apple_platform_type=watchos
+    --cpu=watchos_device_arm64
+
+  @build_bazel_apple_support//platforms:watchos_device_arm64e
+    --apple_platform_type=watchos
+    --cpu=watchos_device_arm64e
+
 flags:
   --cpu=darwin_x86_64
   --apple_platform_type=macos

diff --git a/test/apple_shell_testutils.sh b/test/apple_shell_testutils.sh
@@ -384,7 +384,7 @@ function current_archs() {
           value="$(echo "$option" | cut -d= -f2)"
         else
           # Eliminate `sim_` prefixes from `cpu`s as it is not part of the arch.
-          value="$(echo "$option" | cut -d= -f2 | sed 's/sim_//g')"
+          value="$(echo "$option" | cut -d= -f2 | sed -e 's/sim_//g' -e 's/device_//g')"
         fi
         echo "$value" | tr "," "\n"
         return

diff --git a/test/starlark_tests/apple_dynamic_xcframework_import_tests.bzl b/test/starlark_tests/apple_dynamic_xcframework_import_tests.bzl
@@ -297,7 +297,7 @@ def apple_dynamic_xcframework_import_test_suite(name):
         build_type = "device",
         target_under_test = "//test/starlark_tests/targets_under_test/watchos:app_with_imported_xcframework",
         binary_test_file = "$BUNDLE_ROOT/Frameworks/generated_dynamic_watchos_xcframework.framework/generated_dynamic_watchos_xcframework",
-        binary_test_architecture = "device_arm64",
+        binary_test_architecture = "arm64",
         cpus = {"watchos_cpus": ["device_arm64"]},
         macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "platform WATCHOS"],
     )
@@ -306,7 +306,7 @@ def apple_dynamic_xcframework_import_test_suite(name):
         build_type = "device",
         target_under_test = "//test/starlark_tests/targets_under_test/watchos:app_with_imported_xcframework",
         binary_test_file = "$BUNDLE_ROOT/Frameworks/generated_dynamic_watchos_xcframework.framework/generated_dynamic_watchos_xcframework",
-        binary_test_architecture = "device_arm64e",
+        binary_test_architecture = "arm64e",
         cpus = {"watchos_cpus": ["device_arm64e"]},
         macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "platform WATCHOS"],
     )

diff --git a/test/starlark_tests/targets_under_test/watchos/BUILD b/test/starlark_tests/targets_under_test/watchos/BUILD
@@ -1120,8 +1120,10 @@ generate_dynamic_xcframework(
     },
     platforms = {
         "watchos": [
-            "armv7k",
+            "arm64",
             "arm64_32",
+            "arm64e",
+            "armv7k",
         ],
         "watchos_simulator": [
             "x86_64",