From fed572edd7691190ac2a131436b6418cd102806f Mon Sep 17 00:00:00 2001 From: John Cater Date: Tue, 15 Sep 2020 09:54:26 -0400 Subject: [PATCH] Remove unconditional registration of :android_platform for execution. This platform is only valid on Linux machines, and breaks the build when run from Windows or Mac. The .bazelrc registers it as an execution platform when used with RBE. --- examples/android_instrumentation_test/WORKSPACE | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/android_instrumentation_test/WORKSPACE b/examples/android_instrumentation_test/WORKSPACE index 85d33be8e..f3caa27e2 100644 --- a/examples/android_instrumentation_test/WORKSPACE +++ b/examples/android_instrumentation_test/WORKSPACE @@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") android_sdk_repository( name = "androidsdk", + api_level = 28, build_tools_version = "28.0.2", - api_level=28, ) android_ndk_repository( @@ -66,11 +66,10 @@ http_archive( ) load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig") + # Creates a default toolchain config for RBE. # Use this as is if you are using the rbe_ubuntu16_04 container, # otherwise refer to RBE docs. rbe_autoconfig(name = "buildkite_config") -rbe_autoconfig(name = "rbe_default") -# RBE support for android_device and android_instrumentation_test on RBE. -register_execution_platforms(":android_platform") +rbe_autoconfig(name = "rbe_default")