From ffb0c73604ad3a00d69217846f684c02d754558d Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 29 Sep 2019 10:13:04 +0200 Subject: [PATCH] Java_toolchain: Remove Java 7 compatibility mode Closes #8772. Change-Id: Ia3467b2a33ee4bfbd10cfe3f1027e292d3a967b7 --- tools/jdk/BUILD.java_tools | 27 --------------------------- tools/jdk/default_java_toolchain.bzl | 12 ------------ 2 files changed, 39 deletions(-) diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools index 8ccde8713a2829..fb30daba93645e 100644 --- a/tools/jdk/BUILD.java_tools +++ b/tools/jdk/BUILD.java_tools @@ -17,15 +17,6 @@ SUPRESSED_WARNINGS = select({ java_toolchain( name = "toolchain", bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], - compatible_javacopts = { - # Restrict protos to Java 7 so that they are compatible with Android. - "proto": [ - "-source", - "7", - "-target", - "7", - ], - }, forcibly_disable_header_compilation = 0, genclass = [":GenClass"], header_compiler = [":Turbine"], @@ -74,15 +65,6 @@ java_toolchain( java_toolchain( name = "toolchain_jdk_JAVA_LANGUAGE_LEVEL", bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], - compatible_javacopts = { - # Restrict protos to Java 7 so that they are compatible with Android. - "proto": [ - "-source", - "7", - "-target", - "7", - ], - }, forcibly_disable_header_compilation = 0, genclass = [":GenClass"], header_compiler = [":Turbine"], @@ -135,15 +117,6 @@ java_toolchain( java_toolchain( name = "prebuilt_toolchain", bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], - compatible_javacopts = { - # Restrict protos to Java 7 so that they are compatible with Android. - "proto": [ - "-source", - "7", - "-target", - "7", - ], - }, forcibly_disable_header_compilation = 0, genclass = [":GenClass"], header_compiler = [":Turbine"], diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl index abbbe8157ffb63..09961c269a1ab5 100644 --- a/tools/jdk/default_java_toolchain.bzl +++ b/tools/jdk/default_java_toolchain.bzl @@ -48,17 +48,6 @@ 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 = { "forcibly_disable_header_compilation": 0, "genclass": ["@bazel_tools//tools/jdk:genclass"], @@ -74,7 +63,6 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = { "javac_supports_workers": 1, "jvm_opts": JDK9_JVM_OPTS, "misc": DEFAULT_JAVACOPTS, - "compatible_javacopts": COMPATIBLE_JAVACOPTS, "singlejar": ["@bazel_tools//tools/jdk:singlejar"], "bootclasspath": ["@bazel_tools//tools/jdk:platformclasspath"], "source_version": "8",