Snap for 9947982 from abebf03a587e23c7751875f0ec3dd7358c607c42 to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r8android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release

Change-Id: I40116dc8241c7fba248048f7ce593bcf6d263cf6

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"],
 )