Fix mixup of prebuilt and nonprebuilt toolchain.
Closes
@@ -130,8 +130,8 @@ PREBUILT_TOOLCHAIN_CONFIGURATION = dict(
"@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 @@ NONPREBUILT_TOOLCHAIN_CONFIGURATION = dict(
"@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",
)
