38 lines
1.6 KiB
Python
38 lines
1.6 KiB
Python
--- tools/jdk/default_java_toolchain.bzl.orig 2019-08-06 08:09:07.930962000 +0000
|
|
+++ tools/jdk/default_java_toolchain.bzl 2019-08-06 08:16:15.674960000 +0000
|
|
@@ -19,25 +19,6 @@
|
|
]
|
|
|
|
JDK9_JVM_OPTS = [
|
|
- # Allow JavaBuilder to access internal javac APIs.
|
|
- "--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",
|
|
-
|
|
- # override the javac in the JDK.
|
|
- "--patch-module=java.compiler=$(location @bazel_tools//tools/jdk:java_compiler_jar)",
|
|
- "--patch-module=jdk.compiler=$(location @bazel_tools//tools/jdk:jdk_compiler_jar)",
|
|
-
|
|
- # quiet warnings from com.google.protobuf.UnsafeUtil,
|
|
- # see: https://github.com/google/protobuf/issues/3781
|
|
- # and: https://github.com/bazelbuild/bazel/issues/5599
|
|
- "--add-opens=java.base/java.nio=ALL-UNNAMED",
|
|
- "--add-opens=java.base/java.lang=ALL-UNNAMED",
|
|
]
|
|
|
|
DEFAULT_JAVACOPTS = [
|
|
@@ -70,7 +51,7 @@
|
|
"@bazel_tools//tools/jdk:jdk_compiler_jar",
|
|
],
|
|
"javac_supports_workers": 1,
|
|
- "jvm_opts": JDK9_JVM_OPTS,
|
|
+ "jvm_opts": JDK8_JVM_OPTS,
|
|
"misc": DEFAULT_JAVACOPTS,
|
|
"compatible_javacopts": COMPATIBLE_JAVACOPTS,
|
|
"singlejar": ["@bazel_tools//tools/jdk:singlejar"],
|