Remove references to langtools jars
Follow-up to https://github.com/bazelbuild/bazel/commit/3a0a4f3b6931fbb6303fc98eec63d4434d8aece4
PiperOrigin-RevId: 457065649
Change-Id: I558481c400e9e2fa73d168a6cf6ad9567810cbef
diff --git a/site/en/docs/bazel-and-java.md b/site/en/docs/bazel-and-java.md
index 7dc78a7..cc5548d 100644
--- a/site/en/docs/bazel-and-java.md
+++ b/site/en/docs/bazel-and-java.md
@@ -265,7 +265,6 @@
- `DEFAULT_TOOLCHAIN_CONFIGURATION`: all features, supports JDK versions >= 9
- `VANILLA_TOOLCHAIN_CONFIGURATION`: no additional features, supports JDKs of
arbitrary vendors.
-- `JVM8_TOOLCHAIN_CONFIGURATION`: all features, JDK version 8
- `PREBUILT_TOOLCHAIN_CONFIGURATION`: same as default, but only use prebuilt
tools (`ijar`, `singlejar`)
- `NONPREBUILT_TOOLCHAIN_CONFIGURATION`: same as default, but all tools are
diff --git a/src/test/shell/bazel/bazel_java_test_defaults.sh b/src/test/shell/bazel/bazel_java_test_defaults.sh
index 6e91384..212eeef 100755
--- a/src/test/shell/bazel/bazel_java_test_defaults.sh
+++ b/src/test/shell/bazel/bazel_java_test_defaults.sh
@@ -186,23 +186,6 @@
expect_log 'javabuilder = \["//:VanillaJavaBuilder"\]'
}
-# JVM8_TOOLCHAIN_CONFIGURATION shall override Java 8 internal compiler classes.
-function test_default_java_toolchain_jvm8Toolchain() {
- cat > BUILD <<EOF
-load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain", "JVM8_TOOLCHAIN_CONFIGURATION")
-default_java_toolchain(
- name = "jvm8_toolchain",
- configuration = JVM8_TOOLCHAIN_CONFIGURATION,
-)
-EOF
-
- bazel query //:jvm8_toolchain || fail "default_java_toolchain target failed to build"
- bazel query 'deps(//:jvm8_toolchain)' >& $TEST_log || fail "failed to query //:jvm8_toolchain"
-
- expect_log ":JavaBuilder"
- expect_not_log ":VanillaJavaBuilder"
-}
-
# DEFAULT_TOOLCHAIN_CONFIGURATION shall use JavaBuilder and override Java 9+ internal compiler classes.
function test_default_java_toolchain_javabuilderToolchain() {
cat > BUILD <<EOF
diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools
index 7773a8f..c8a35e2 100644
--- a/tools/jdk/BUILD.tools
+++ b/tools/jdk/BUILD.tools
@@ -1,7 +1,6 @@
load(
"@bazel_tools//tools/jdk:default_java_toolchain.bzl",
"DEFAULT_TOOLCHAIN_CONFIGURATION",
- "JVM8_TOOLCHAIN_CONFIGURATION",
"PREBUILT_TOOLCHAIN_CONFIGURATION",
"VANILLA_TOOLCHAIN_CONFIGURATION",
"bootclasspath",
@@ -379,17 +378,6 @@
target_version = "18",
)
-# Deprecated, do not use.
-# It will be removed after migration to Java toolchain resolution.
-default_java_toolchain(
- name = "toolchain_hostjdk8",
- configuration = JVM8_TOOLCHAIN_CONFIGURATION,
- java_runtime = ":current_host_java_runtime",
- source_version = "8",
- target_version = "8",
- toolchain_definition = False,
-)
-
default_java_toolchain(
name = "prebuilt_toolchain",
configuration = PREBUILT_TOOLCHAIN_CONFIGURATION,
diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index 183dd55..d8a80dc 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -75,12 +75,6 @@
],
)
-JVM8_TOOLCHAIN_CONFIGURATION = dict(
- tools = ["@remote_java_tools//:javac_jar"],
- jvm_opts = ["-Xbootclasspath/p:$(location @remote_java_tools//:javac_jar)"],
- java_runtime = "@bazel_tools//tools/jdk:jdk_8",
-)
-
DEFAULT_TOOLCHAIN_CONFIGURATION = dict(
jvm_opts = [
# Compact strings make JavaBuilder slightly slower.
diff --git a/tools/jdk/local_java_repository.bzl b/tools/jdk/local_java_repository.bzl
index e380f9e..336b794d 100644
--- a/tools/jdk/local_java_repository.bzl
+++ b/tools/jdk/local_java_repository.bzl
@@ -14,7 +14,7 @@
"""Rules for importing and registering a local JDK."""
-load(":default_java_toolchain.bzl", "JVM8_TOOLCHAIN_CONFIGURATION", "default_java_toolchain")
+load(":default_java_toolchain.bzl", "default_java_toolchain")
def _detect_java_version(repository_ctx, java_bin):
properties_out = repository_ctx.execute([java_bin, "-XshowSettings:properties"]).stderr
@@ -95,15 +95,7 @@
toolchain = runtime_name,
)
- if version == "8":
- default_java_toolchain(
- name = name + "_toolchain_java8",
- configuration = JVM8_TOOLCHAIN_CONFIGURATION,
- source_version = version,
- target_version = version,
- java_runtime = runtime_name,
- )
- elif type(version) == type("") and version.isdigit() and int(version) > 8:
+ if type(version) == type("") and version.isdigit() and int(version) > 8:
for version in range(8, int(version) + 1):
default_java_toolchain(
name = name + "_toolchain_java" + str(version),
