diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-30 04:23:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 04:23:18 +0000 |
| commit | d6850c6955271c9af28503d4028c8f87dd59089c (patch) | |
| tree | b9c2f2008fd2bc8b6d1830f8748e0bcf82054b6d | |
| parent | 0bfafa473bd3b5b6e2af38fd26d02fb2aa2a285e (diff) | |
| parent | 483b2d092d29c29bad322ce682bba94ce4dc81b0 (diff) | |
| download | sdk-d6850c6955271c9af28503d4028c8f87dd59089c.tar.gz | |
Merge "Update platform targets in //prebuilts/sdk to match //build/bazel/platforms" am: 7ccdb660e5 am: 483b2d092d
Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1691699
Change-Id: I39ec3d58dec7e8726a907950a53628f68d415ae5
| -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", |