diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2017-09-04 13:21:39 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-09-04 18:24:29 +0200 |
| commit | 791bef85b6eab1d68d2f5ce7760cc12da02ef316 (patch) | |
| tree | 7962a746b6e92c2718386caf24f05a22e71385ec | |
| parent | 9d8a5bd160b3c8c11e7198a95d4520b18ace7254 (diff) | |
Remove some left over bits of Java 7 support
Change-Id: I3fce66ec2e63d152aafc0cf9ea067d6dbf1245f7
PiperOrigin-RevId: 167484075
| -rw-r--r-- | scripts/packages/debian/BUILD | 10 | ||||
| -rw-r--r-- | src/BUILD | 6 | ||||
| -rw-r--r-- | src/java_tools/buildjar/BUILD | 24 |
3 files changed, 4 insertions, 36 deletions
diff --git a/scripts/packages/debian/BUILD b/scripts/packages/debian/BUILD index 01b274c32b..3180079241 100644 --- a/scripts/packages/debian/BUILD +++ b/scripts/packages/debian/BUILD @@ -71,14 +71,8 @@ pkg_deb( architecture = "amd64", built_using = "bazel (HEAD)", data = ":debian-data", - depends = select({ - "//tools/jdk:jdk7": [ - "java7-jdk | java7-sdk | oracle-java7-installer", - ], - "//conditions:default": [ - "google-jdk | java8-jdk | java8-sdk | oracle-java8-installer", - ], - }) + [ + depends = [ + "google-jdk | java8-jdk | java8-sdk | oracle-java8-installer", "g++", "zlib1g-dev", "bash-completion", @@ -163,6 +163,7 @@ py_binary( "//src/java_tools/junitrunner/java/com/google/testing/coverage:embedded_tools", "//third_party/ijar", "//third_party/ijar:embedded_tools", + "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_deploy.jar", "//third_party/java/jacoco:srcs", "//third_party/zlib:embedded_tools", ] + select({ @@ -199,11 +200,6 @@ py_binary( "//conditions:default": [ "//src/tools/singlejar:singlejar", ], - }) + select({ - "//tools/jdk:jdk7": [], - "//conditions:default": [ - "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_deploy.jar", - ], }) + (select({ ":darwin": [ "@openjdk_macos//file", diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD index 6b8be1dc5f..2daf5558b5 100644 --- a/src/java_tools/buildjar/BUILD +++ b/src/java_tools/buildjar/BUILD @@ -16,10 +16,7 @@ java_binary( filegroup( name = "JavaBuilderDeploy", - srcs = select({ - "//tools/jdk:jdk7": [":VanillaJavaBuilder_deploy.jar"], - "//conditions:default": [":JavaBuilder_deploy.jar"], - }), + srcs = [":JavaBuilder_deploy.jar"], ) filegroup( @@ -80,22 +77,3 @@ java_toolchain( target_version = "8", visibility = ["//visibility:public"], ) - -java_toolchain( - name = "bootstrap_toolchain_jdk7", - bootclasspath = ["//tools/jdk:bootclasspath"], - encoding = "UTF-8", - extclasspath = ["//tools/jdk:extclasspath"], - genclass = ["bootstrap_genclass_deploy.jar"], - ijar = ["//third_party/ijar"], - javabuilder = [":bootstrap_VanillaJavaBuilder_deploy.jar"], - javac = ["//third_party/java/jdk/langtools:javac7_jar"], - jvm_opts = [ - "-XX:+TieredCompilation", - "-XX:TieredStopAtLevel=1", - ], - singlejar = ["//src/java_tools/singlejar:bootstrap_deploy.jar"], - source_version = "7", - target_version = "7", - visibility = ["//visibility:public"], -) |