From ac505c7df7da1219d146ea09062f38dfdf9e232e Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 19 Aug 2022 12:12:31 -0700 Subject: [PATCH] Switch to using new-style Bazel platform constraints. (#2484) The old style will stop working in Bazel 6.0 (see https://github.com/bazelbuild/bazel/commit/3469784a4935c91b4ac22bcfed6be52e6dfec878) Signed-off-by: Benjamin Peterson Signed-off-by: JP Simard --- mobile/third_party/rbe_configs/config/BUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mobile/third_party/rbe_configs/config/BUILD b/mobile/third_party/rbe_configs/config/BUILD index e55e51829b14..27ede0e39852 100644 --- a/mobile/third_party/rbe_configs/config/BUILD +++ b/mobile/third_party/rbe_configs/config/BUILD @@ -21,13 +21,13 @@ package(default_visibility = ["//visibility:public"]) toolchain( name = "cc-toolchain", exec_compatible_with = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", + "@platforms//os:linux", + "@platforms//cpu:x86_64", "@bazel_tools//tools/cpp:clang", ], target_compatible_with = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", + "@platforms//os:linux", + "@platforms//cpu:x86_64", ], toolchain = "//third_party/rbe_configs/cc:cc-compiler-k8", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", @@ -37,8 +37,8 @@ platform( name = "platform", parents = ["@local_config_platform//:host"], constraint_values = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", + "@platforms//os:linux", + "@platforms//cpu:x86_64", "@bazel_tools//tools/cpp:clang", ], exec_properties = { @@ -52,8 +52,8 @@ platform( name = "platform-asan", parents = ["@local_config_platform//:host"], constraint_values = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", + "@platforms//os:linux", + "@platforms//cpu:x86_64", "@bazel_tools//tools/cpp:clang", ], exec_properties = {