Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java_toolchain: Remove Java 7 compatibility mode #9450

Closed
wants to merge 1 commit into from
+0 −39
Closed

Java_toolchain: Remove Java 7 compatibility mode #9450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions tools/jdk/BUILD.java_tools
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down
12 changes: 0 additions & 12 deletions tools/jdk/default_java_toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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",
Expand Down