diff options
| author | Romain Jobredeaux <jobredeaux@google.com> | 2023-04-13 23:06:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-13 23:06:46 +0000 |
| commit | fe4d9ac26508ce8bf14d0bb56f97499664f561a4 (patch) | |
| tree | 34d720e66745b8daf1632bb1fcd89fb9c0a40894 | |
| parent | f16d80689e17011f71e1c05c8431ff3b79c90f48 (diff) | |
| parent | abebf03a587e23c7751875f0ec3dd7358c607c42 (diff) | |
| download | bazelbuild-rules_android-fe4d9ac26508ce8bf14d0bb56f97499664f561a4.tar.gz | |
Use java toolchain resolution in Android rules. am: 05deeca4e3 am: 82f60a8f1c am: 4664a1174d am: abebf03a58
Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_android/+/2472884
Change-Id: I54cd7841eca4d69e0e76e11165f246410f0be5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tools/jdk/BUILD | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index edc9d13..76b1921 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -1,13 +1,9 @@ load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain") -default_java_toolchain( +# AOSP-only change +alias( name = "toolchain_android_only", - bootclasspath = [ - "//tools/android:android_jar", - # TODO(b/175805830): Add this only when desugaring is enabled. - "@bazel_tools//tools/android:desugar_java8_extra_bootclasspath", - ], - java_runtime = ":current_java_runtime", + actual = "@bazel_tools//tools/jdk:current_java_toolchain", visibility = ["//visibility:public"], ) |