Automated rollback of commit 5b8fd3c752.

*** Reason for rollback ***

Roll forward

*** Original change description ***

Automated rollback of commit e50397c444.

*** 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: 261704277
Change-Id: Id8a263c9258f448d402ae27cdf46576d6c7c8a49
This commit is contained in:
Googler 2019-08-05 09:40:46 -07:00 committed by Copybara-Service
parent 5b8fd3c752
commit 6ad3cffd67
2 changed files with 67 additions and 22 deletions

View File

@ -13,13 +13,45 @@ filegroup(
# To add a new constraint_value see https://github.com/bazelbuild/platforms.
constraint_setting(name = "cpu")
# TODO(b/136237408): Remove this generic CPU name and replace with a specific one.
constraint_value(
name = "x86_32",
name = "aarch64",
constraint_setting = ":cpu",
)
# TODO(b/136237408): Remove this generic CPU name and replace with a specific one.
constraint_value(
name = "arm",
constraint_setting = ":cpu",
)
constraint_value(
name = "x86_64",
name = "arm64_32",
constraint_setting = ":cpu",
)
constraint_value(
name = "arm64",
constraint_setting = ":cpu",
)
constraint_value(
name = "arm64e",
constraint_setting = ":cpu",
)
constraint_value(
name = "armv7",
constraint_setting = ":cpu",
)
constraint_value(
name = "armv7k",
constraint_setting = ":cpu",
)
constraint_value(
name = "i386",
constraint_setting = ":cpu",
)
@ -28,17 +60,17 @@ constraint_value(
constraint_setting = ":cpu",
)
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",
)

View File

@ -13,16 +13,6 @@ filegroup(
# To add a new constraint_value see https://github.com/bazelbuild/platforms.
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",
@ -42,3 +32,26 @@ constraint_value(
name = "windows",
constraint_setting = ":os",
)
### Apple OS Values
constraint_value(
name = "ios",
constraint_setting = ":os",
)
# TODO(b/138656886): Rename this to macos instead of osx.
constraint_value(
name = "osx",
constraint_setting = ":os",
)
constraint_value(
name = "tvos",
constraint_setting = ":os",
)
constraint_value(
name = "watchos",
constraint_setting = ":os",
)