Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unconditional registration of :android_platform for execution. #456

Merged
merged 1 commit into from
Sep 16, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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")