Skip to content

Commit

Permalink
Remove unconditional registration of :android_platform for execution. (
Browse files Browse the repository at this point in the history
…#456)

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.
  • Loading branch information
katre committed Sep 16, 2020
1 parent 1c41eca commit 54582a7
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions examples/android_instrumentation_test/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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")

0 comments on commit 54582a7

Please sign in to comment.