Bazel: Simplify java 11 toolchain definition Per default the attributes of default_java_toolchain macro is set to correct values, so that we don't need to specify them. Moreover, a new Bazel release could set new values, so that own values would override the default values and thus revert them. This is the case with default_java_toolchain.misc attribute. During Error Prone upgrade, a new option was added -XepOpt:ReturnValueIgnored:ObjectMethods=true, but overridden in our own impementation, see: [1],[2]. This is a preparation change to update Bazel version to 5.x release. [1] https://github.com/bazelbuild/bazel/issues/14587 [2] https://github.com/bazelbuild/bazel/issues/14589 Change-Id: Ib7986555c3dabacc17db11cc7787b526fb31012b
diff --git a/tools/BUILD b/tools/BUILD index 04375f9..08c4829 100644 --- a/tools/BUILD +++ b/tools/BUILD
@@ -6,51 +6,13 @@ exports_files(["nongoogle.bzl"]) -JDK11_JVM_OPTS = select({ - "@bazel_tools//src/conditions:openbsd": ["-Xbootclasspath/p:$(location @bazel_tools//tools/jdk:javac_jar)"], - "//conditions:default": [ - "--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_java11", - bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath.jar"], - forcibly_disable_header_compilation = False, - genclass = ["@bazel_tools//tools/jdk:genclass"], - header_compiler = ["@bazel_tools//tools/jdk:turbine"], - header_compiler_direct = ["@bazel_tools//tools/jdk:turbine_direct"], - ijar = ["@bazel_tools//tools/jdk:ijar"], - javabuilder = ["@bazel_tools//tools/jdk:javabuilder"], - javac_supports_workers = True, - jvm_opts = JDK11_JVM_OPTS, - misc = [ - "-XDskipDuplicateBridges=true", - "-g", - "-parameters", - ], package_configuration = [ ":error_prone", ], - singlejar = ["@bazel_tools//tools/jdk:singlejar"], source_version = "11", target_version = "11", - tools = [ - "@bazel_tools//tools/jdk:java_compiler_jar", - "@bazel_tools//tools/jdk:javac_jar", - "@bazel_tools//tools/jdk:jdk_compiler_jar", - ], visibility = ["//visibility:public"], )