commit 9fba7c5cf577f6b2e7537b894ce90ce81e352d77
author Ivo List <ilist@google.com> Thu Dec 17 11:59:38 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Dec 17 12:01:01 2020 -0800
tree 72bdaf54b4fb7e3fb43c3a6fb34994afef2049ac
parent a0a1eca7f6d7de806649a14221a2fdf38e0eb497

Fix mixup of prebuilt and nonprebuilt toolchain.

Closes #12724.

PiperOrigin-RevId: 348065963

tools/jdk/default_java_toolchain.bzl

diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index f3f8b58..8fea880 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -130,8 +130,8 @@
         "@remote_java_tools//:java_compiler_jar",
         "@remote_java_tools//:jdk_compiler_jar",
     ],
-    ijar = ["@remote_java_tools//:ijar_cc_binary"],
-    singlejar = ["@remote_java_tools//:singlejar_cc_bin"],
+    ijar = ["@bazel_tools//tools/jdk:ijar_prebuilt_binary"],
+    singlejar = ["@bazel_tools//tools/jdk:prebuilt_singlejar"],
     java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
 )
 
@@ -149,8 +149,8 @@
         "@remote_java_tools//:java_compiler_jar",
         "@remote_java_tools//:jdk_compiler_jar",
     ],
-    ijar = ["@bazel_tools//tools/jdk:ijar_prebuilt_binary"],
-    singlejar = ["@bazel_tools//tools/jdk:prebuilt_singlejar"],
+    ijar = ["@remote_java_tools//:ijar_cc_binary"],
+    singlejar = ["@remote_java_tools//:singlejar_cc_bin"],
     java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
 )