aboutsummaryrefslogtreecommitdiffstats
path: root/tools/BUILD
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2022-01-10 22:27:14 +0100
committerDavid Ostrovsky <d.ostrovsky@gmx.de>2022-01-20 00:54:15 -0500
commitc812947962103c427a202f6df38d23e1088007f1 (patch)
treedee2888051d047b87fb56bef8209e217b34a784a /tools/BUILD
parentbf3298478aefd93a8ab02ec2f7f08f00c5fdcc73 (diff)
downloadjgit-c812947962103c427a202f6df38d23e1088007f1.tar.gz
jgit-c812947962103c427a202f6df38d23e1088007f1.zip
Bazel: Simplify java 11 toolchain definition
Also remove unused JDK9_JVM_OPTS constant. Change-Id: I0f45ca8312a2a8c3aee3855e3ef3afa95808b4ad
Diffstat (limited to 'tools/BUILD')
-rw-r--r--tools/BUILD22
1 files changed, 2 insertions, 20 deletions
diff --git a/tools/BUILD b/tools/BUILD
index 9d750bbbf5..b80b2bb3ab 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -1,34 +1,16 @@
load(
"@bazel_tools//tools/jdk:default_java_toolchain.bzl",
- "JDK9_JVM_OPTS",
"default_java_toolchain",
)
load("@rules_java//java:defs.bzl", "java_package_configuration")
-JDK11_JVM_OPTS = [
- "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
- "--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
- "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
- "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
- "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "--patch-module=java.compiler=$(location @bazel_tools//tools/jdk:java_compiler_jar)",
- "--patch-module=jdk.compiler=$(location @bazel_tools//tools/jdk:jdk_compiler_jar)",
- "--add-opens=java.base/java.nio=ALL-UNNAMED",
- "--add-opens=java.base/java.lang=ALL-UNNAMED",
-]
-
default_java_toolchain(
name = "error_prone_warnings_toolchain",
- bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath.jar"],
- jvm_opts = JDK11_JVM_OPTS,
- source_version = "11",
- target_version = "11",
package_configuration = [
":error_prone",
],
+ source_version = "11",
+ target_version = "11",
visibility = ["//visibility:public"],
)