diff options
| author |  cushon <cushon@google.com> | 2018-08-07 02:59:30 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-07 03:00:59 -0700 |
| commit | 808ec9ff9b5cec14f23a4ba106bc5249cacc8c54 (patch) | |
| tree | cee3449c2132f75abd17efb35ea8c913d503c591 /tools | |
| parent | f203272ad93c9fa6239a37532c9ecbe0bdb9e70f (diff) | |
Clean up Java toolchain configuration
now that JDK 8 host_javabases are no longer supported.
PiperOrigin-RevId: 207687089
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/jdk/BUILD | 22 | ||||
| -rw-r--r-- | tools/jdk/default_java_toolchain.bzl | 8 |
2 files changed, 3 insertions, 27 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 689bc138d7..454d6742b7 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -3,8 +3,6 @@ package(default_visibility = ["//visibility:public"]) load( "//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain", - "JDK8_JVM_OPTS", - "JDK10_JVM_OPTS", "DEFAULT_JAVACOPTS", ) @@ -195,27 +193,15 @@ genrule( ) default_java_toolchain( - name = "toolchain_hostjdk8", - bootclasspath = [":bootclasspath"], - extclasspath = [":extclasspath"], - jvm_opts = JDK8_JVM_OPTS, - source_version = "8", - target_version = "8", -) - -default_java_toolchain( - name = "toolchain_hostjdk10", + name = "toolchain", bootclasspath = [":bootclasspath"], extclasspath = [":extclasspath"], - jvm_opts = JDK10_JVM_OPTS, source_version = "8", target_version = "8", ) default_java_toolchain( name = "toolchain_java9", - # We use the same flags for JDK9 and 10 - jvm_opts = JDK10_JVM_OPTS, misc = DEFAULT_JAVACOPTS + [ "--release", "9", @@ -224,18 +210,12 @@ default_java_toolchain( default_java_toolchain( name = "toolchain_java10", - jvm_opts = JDK10_JVM_OPTS, misc = DEFAULT_JAVACOPTS + [ "--release", "10", ], ) -alias( - name = "toolchain", - actual = "//external:java_toolchain", -) - filegroup( name = "srcs", srcs = [ diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl index 1cd5619cc8..db5e3e8616 100644 --- a/tools/jdk/default_java_toolchain.bzl +++ b/tools/jdk/default_java_toolchain.bzl @@ -14,11 +14,7 @@ """Bazel rules for creating Java toolchains.""" -JDK8_JVM_OPTS = [ - "-Xbootclasspath/p:$(location @bazel_tools//third_party/java/jdk/langtools:javac_jar)", -] - -JDK10_JVM_OPTS = [ +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", @@ -75,7 +71,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = { "@bazel_tools//third_party/java/jdk/langtools:jdk_compiler_jar", ], "javac_supports_workers": 1, - "jvm_opts": JDK8_JVM_OPTS, + "jvm_opts": JVM_OPTS, "misc": DEFAULT_JAVACOPTS, "compatible_javacopts": COMPATIBLE_JAVACOPTS, "singlejar": ["@bazel_tools//tools/jdk:singlejar"], |