Java_toolchain: Remove Java 7 compatibility mode

Closes bazelbuild#8772. Change-Id: Ia3467b2a33ee4bfbd10cfe3f1027e292d3a967b7
davido · Sep 29, 2019 · ffb0c73 · ffb0c73
1 parent 1664d54
commit ffb0c73
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 39 deletions.
diff --git 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
@@ -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",