Add watchos_device_arm64(e) CPUs

bazelbuild · Dec 18, 2023 · 825c632 · 825c632
1 parent f373051
commit 825c632
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/apple/BUILD b/apple/BUILD
@@ -1,5 +1,5 @@
-load(":cc_toolchain_forwarder.bzl", "cc_toolchain_forwarder")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load(":cc_toolchain_forwarder.bzl", "cc_toolchain_forwarder")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -27,6 +27,7 @@ licenses(["notice"])
         "watchos_arm64_32",
         "watchos_x86_64",
         "watchos_device_arm64",
+        "watchos_device_arm64e",
     ]
 ]
 

diff --git a/test/starlark_tests/apple_dynamic_xcframework_import_tests.bzl b/test/starlark_tests/apple_dynamic_xcframework_import_tests.bzl
@@ -292,6 +292,24 @@ def apple_dynamic_xcframework_import_test_suite(name):
         cpus = {"watchos_cpus": ["arm64_32"]},
         macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "platform WATCHOS"],
     )
+    archive_contents_test(
+        name = "{}_links_watchos_device_arm64_macho_load_cmd_for_device_test".format(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",
+        cpus = {"watchos_cpus": ["device_arm64"]},
+        macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "platform WATCHOS"],
+    )
+    archive_contents_test(
+        name = "{}_links_watchos_device_arm64e_macho_load_cmd_for_device_test".format(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",
+        cpus = {"watchos_cpus": ["device_arm64e"]},
+        macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "platform WATCHOS"],
+    )
 
     # Verify tvos_application bundles XCFramework library for device and simulator architectures.
     archive_contents_test(