From 3d876a656f4bc145ab56bb2f21e6a5bee9ccb2cf Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 13:24:59 -0800 Subject: [PATCH] Buildifier --- WORKSPACE | 8 ++++---- bazel/custom_exec_properties.bzl | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index fadfbfb5a7a..f1eeb514149 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -32,16 +32,16 @@ load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig") # Create toolchain configuration for remote execution. rbe_autoconfig( name = "rbe_default", - # use exec_properties instead of deprecated remote_execution_properties - use_legacy_platform_definition = False, exec_properties = create_exec_properties_dict( + docker_add_capabilities = "SYS_PTRACE", + docker_privileged = True, # n1-highmem-2 is the default (small machine) machine type. Targets # that want to use other machines (such as LARGE_MACHINE) will override # this value. gce_machine_type = "n1-highmem-2", - docker_add_capabilities = "SYS_PTRACE", - docker_privileged = True, ), + # use exec_properties instead of deprecated remote_execution_properties + use_legacy_platform_definition = False, ) load("@bazel_toolchains//rules:environments.bzl", "clang_env") diff --git a/bazel/custom_exec_properties.bzl b/bazel/custom_exec_properties.bzl index f03ef859a79..6605f5cc403 100644 --- a/bazel/custom_exec_properties.bzl +++ b/bazel/custom_exec_properties.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - load("@grpc_custom_exec_properties//:constants.bzl", _LARGE_MACHINE = "LARGE_MACHINE") LARGE_MACHINE = _LARGE_MACHINE