Remove references to langtools jars Follow-up to unknown commit PiperOrigin-RevId: 457065649 Change-Id: I0d2b8c86a8e1cc34dca78853febe9e98da9f2a20
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl index 8558aa9..e5f4443 100644 --- a/toolchains/default_java_toolchain.bzl +++ b/toolchains/default_java_toolchain.bzl
@@ -16,10 +16,6 @@ load("@rules_java//java:defs.bzl", "java_toolchain") -JDK8_JVM_OPTS = [ - "-Xbootclasspath/p:$(location @remote_java_tools//:javac_jar)", -] - # JVM options, without patching java.compiler and jdk.compiler modules. BASE_JDK9_JVM_OPTS = [ # Allow JavaBuilder to access internal javac APIs. @@ -85,12 +81,6 @@ ], ) -JVM8_TOOLCHAIN_CONFIGURATION = dict( - tools = ["@remote_java_tools//:javac_jar"], - jvm_opts = ["-Xbootclasspath/p:$(location @remote_java_tools//:javac_jar)"], - java_runtime = "//toolchains:jdk_8", -) - DEFAULT_TOOLCHAIN_CONFIGURATION = dict( jvm_opts = [ # Compact strings make JavaBuilder slightly slower.
diff --git a/toolchains/local_java_repository.bzl b/toolchains/local_java_repository.bzl index 2c13e89..7587022 100644 --- a/toolchains/local_java_repository.bzl +++ b/toolchains/local_java_repository.bzl
@@ -15,7 +15,7 @@ """Rules for importing and registering a local JDK.""" load("@rules_java//java:defs.bzl", "java_runtime") -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 @@ -102,15 +102,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),