diff options
| author | Alex Humesky <ahumesky@google.com> | 2021-04-29 21:13:23 -0400 |
|---|---|---|
| committer | Alex Humesky <ahumesky@google.com> | 2021-04-29 21:13:23 -0400 |
| commit | 2aba094d6c10b8d84940c629dc1a7d54d2c5be55 (patch) | |
| tree | b9c2f2008fd2bc8b6d1830f8748e0bcf82054b6d | |
| parent | bfecfbf10af3fc71609fb636538b48314536a6ca (diff) | |
| download | sdk-2aba094d6c10b8d84940c629dc1a7d54d2c5be55.tar.gz | |
Update platform targets in //prebuilts/sdk to match //build/bazel/platforms
Test: Built //build/bazel/examples/android_app/java/com/app
Change-Id: Ib002fa9f7e307f97290d2a4270fe81dab3336d1a
| -rw-r--r-- | BUILD.bazel | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 3669a9a4e..0b6e2d560 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -33,15 +33,15 @@ java_binary( toolchain( name = "android_sdk_tools", exec_compatible_with = [ - "@bazel_tools//platforms:x86_64", - "@bazel_tools//platforms:linux", + "//build/bazel/platforms/arch:x86_64", + "//build/bazel/platforms/os:linux", ], # TODO(b/175833893): This causes the toolchain to not be selected, so # disable for now. #target_compatible_with = [ - # "@bazel_tools//platforms:android", + # "//build/bazel/platforms/os:android", #], - toolchain = "@//prebuilts/sdk:android_sdk", + toolchain = ":android_sdk", toolchain_type = "@rules_android//toolchains/android_sdk:toolchain_type", visibility = ["//visibility:public"], ) @@ -72,11 +72,11 @@ toolchain( toolchain( name = "android_sdk_tools_for_native_android_binary", exec_compatible_with = [ - "@bazel_tools//platforms:x86_64", - "@bazel_tools//platforms:linux", + "//build/bazel/platforms/arch:x86_64", + "//build/bazel/platforms/os:linux", ], target_compatible_with = [ - "@bazel_tools//platforms:android", + "//build/bazel/platforms/os:android", ], toolchain = ":android_sdk", toolchain_type = "@bazel_tools//tools/android:sdk_toolchain_type", |