diff options
| author |  buchgr <buchgr@google.com> | 2018-07-24 11:50:48 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-24 11:51:59 -0700 |
| commit | 4c9149d558161e7d3e363fb697f5852bc5742a36 (patch) | |
| tree | e002f4733ad60b3e2404bd1ce0ce9f75b02fbbd9 /tools | |
| parent | bf4123df23b5f93e572cd920f15afba340f92391 (diff) | |
update to embedded jdk to jdk10
RELNOTES: The JDK shipped with Bazel was updated to JDK10.
PiperOrigin-RevId: 205865966
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/jdk/BUILD | 18 | ||||
| -rw-r--r-- | tools/jdk/default_java_toolchain.bzl | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 14699e14d0..4d92e13b19 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -4,7 +4,7 @@ load( "//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain", "JDK8_JVM_OPTS", - "JDK9_JVM_OPTS", + "JDK10_JVM_OPTS", "DEFAULT_JAVACOPTS", ) @@ -219,23 +219,33 @@ default_java_toolchain( ) default_java_toolchain( - name = "toolchain_hostjdk9", + name = "toolchain_hostjdk10", bootclasspath = [":bootclasspath"], extclasspath = [":extclasspath"], - jvm_opts = JDK9_JVM_OPTS, + jvm_opts = JDK10_JVM_OPTS, source_version = "8", target_version = "8", ) default_java_toolchain( name = "toolchain_java9", - jvm_opts = JDK9_JVM_OPTS, + # We use the same flags for JDK9 and 10 + jvm_opts = JDK10_JVM_OPTS, misc = DEFAULT_JAVACOPTS + [ "--release", "9", ], ) +default_java_toolchain( + name = "toolchain_java10", + jvm_opts = JDK10_JVM_OPTS, + misc = DEFAULT_JAVACOPTS + [ + "--release", + "10", + ], +) + alias( name = "toolchain", actual = "//external:java_toolchain", diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl index e22311e9d4..1cd5619cc8 100644 --- a/tools/jdk/default_java_toolchain.bzl +++ b/tools/jdk/default_java_toolchain.bzl @@ -18,7 +18,7 @@ JDK8_JVM_OPTS = [ "-Xbootclasspath/p:$(location @bazel_tools//third_party/java/jdk/langtools:javac_jar)", ] -JDK9_JVM_OPTS = [ +JDK10_JVM_OPTS = [ # In JDK9 we have seen a ~30% slow down in JavaBuilder performance when using # G1 collector and having compact strings enabled. "-XX:+UseParallelOldGC", |