diff options
| author |  cushon <cushon@google.com> | 2018-04-25 09:43:05 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-25 09:44:32 -0700 |
| commit | 618ab2c70ec2d9726fb21a98ba25943f13e0d6e8 (patch) | |
| tree | 4f886d13e2391b5f14b730872ea630da04244aeb /tools/jdk | |
| parent | f0cd2d259833f3f8521b832051d425458ff316e9 (diff) | |
Consolidate compatible_javacopts definition
The jdk8/jdk9 difference was a work-around for:
https://github.com/bazelbuild/bazel/commit/9666ecc4c6e27467515e362dc25a785dec69fc1b
PiperOrigin-RevId: 194253194
Diffstat (limited to 'tools/jdk')
| -rw-r--r-- | tools/jdk/BUILD | 16 | ||||
| -rw-r--r-- | tools/jdk/default_java_toolchain.bzl | 13 |
2 files changed, 13 insertions, 16 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index ec42ec0e01..87e654f890 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -215,15 +215,6 @@ genrule( default_java_toolchain( name = "toolchain_jdk8", bootclasspath = [":bootclasspath"], - compatible_javacopts = { - # Restrict protos to Java 7 so that they are compatible with Android. - "proto": [ - "-source", - "7", - "-target", - "7", - ], - }, extclasspath = [":extclasspath"], jvm_opts = JDK8_JVM_OPTS, source_version = "8", @@ -232,13 +223,6 @@ default_java_toolchain( default_java_toolchain( name = "toolchain_jdk9", - compatible_javacopts = { - # Restrict protos to Java 7 so that they are compatible with Android. - "proto": [ - "--release", - "7", - ], - }, jvm_opts = JDK9_JVM_OPTS, misc = DEFAULT_JAVACOPTS + [ "--release", diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl index b719d166ec..ca53e165c2 100644 --- a/tools/jdk/default_java_toolchain.bzl +++ b/tools/jdk/default_java_toolchain.bzl @@ -44,6 +44,18 @@ DEFAULT_JAVACOPTS = [ "-parameters", ] +PROTO_JAVACOPTS = [ + # Restrict protos to Java 7 so that they are compatible with Android. + "-source", + "7", + "-target", + "7", +] + +COMPATIBLE_JAVACOPTS = { + "proto": PROTO_JAVACOPTS, +} + DEFAULT_TOOLCHAIN_CONFIGURATION = { "encoding": "UTF-8", "forcibly_disable_header_compilation": 0, @@ -59,6 +71,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = { "javac_supports_workers": 1, "jvm_opts": JDK8_JVM_OPTS, "misc": DEFAULT_JAVACOPTS, + "compatible_javacopts": COMPATIBLE_JAVACOPTS, "singlejar": ["@bazel_tools//tools/jdk:singlejar"], } |