Automated rollback of commit e50397c44435b433843881b69e3a81733ac377ba.
*** Reason for rollback ***
Breaks //third_party/arcore/unity/instant_preview/plugin/unity_plugin:unity_plugin_build_test_mac
[]
*** Original change description ***
Add Apple CPU and OS constraint values to bazel_platforms.
RELNOTES: None
PiperOrigin-RevId: 260800549
Change-Id: I30f8caf94eb6fc9bd2fc37ce6c51b76dcd34e98e
diff --git a/cpu/BUILD b/cpu/BUILD
index 54d5712..8b76bff 100644
--- a/cpu/BUILD
+++ b/cpu/BUILD
@@ -14,52 +14,12 @@
constraint_setting(name = "cpu")
constraint_value(
- name = "aarch64",
+ name = "x86_32",
constraint_setting = ":cpu",
)
constraint_value(
- name = "arm",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "arm64_32",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "arm64",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "arm64e",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "armv6",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "armv7",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "armv7k",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "armv7s",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "i386",
+ name = "x86_64",
constraint_setting = ":cpu",
)
@@ -69,16 +29,16 @@
)
constraint_value(
+ name = "arm",
+ constraint_setting = ":cpu",
+)
+
+constraint_value(
+ name = "aarch64",
+ constraint_setting = ":cpu",
+)
+
+constraint_value(
name = "s390x",
constraint_setting = ":cpu",
)
-
-constraint_value(
- name = "x86_32",
- constraint_setting = ":cpu",
-)
-
-constraint_value(
- name = "x86_64",
- constraint_setting = ":cpu",
-)
diff --git a/os/BUILD b/os/BUILD
index e8a5050..5446917 100644
--- a/os/BUILD
+++ b/os/BUILD
@@ -14,6 +14,16 @@
constraint_setting(name = "os")
constraint_value(
+ name = "osx",
+ constraint_setting = ":os",
+)
+
+constraint_value(
+ name = "ios",
+ constraint_setting = ":os",
+)
+
+constraint_value(
name = "freebsd",
constraint_setting = ":os",
)
@@ -32,32 +42,3 @@
name = "windows",
constraint_setting = ":os",
)
-
-### Apple OS Values
-
-constraint_value(
- name = "ios",
- constraint_setting = ":os",
-)
-
-constraint_value(
- name = "macos",
- constraint_setting = ":os",
-)
-
-# TODO(b/138656886): Migrate current usages of
-# //os:osx to :macos instead.
-alias(
- name = "osx",
- actual = ":macos",
-)
-
-constraint_value(
- name = "tvos",
- constraint_setting = ":os",
-)
-
-constraint_value(
- name = "watchos",
- constraint_setting = ":os",
-)
