Clean up ijar tests that use Java 8 features

--
MOS_MIGRATED_REVID=134040102

2 files changed, 2 insertions, 25 deletions

diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index 179512434e..b05f9ce47f 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -37,7 +37,6 @@ sh_test(
         ":definitely_zip64.jar",
         ":zip_count",
         "TypeAnnotationTest2.java",
-        # invokedynamic/ClassWithLambda.java, compiled with javac8
         ":libinvokedynamic.jar",
         # Intentionally bad test JAR: file count in central directory
         # wrong.
@@ -71,7 +70,6 @@ java_library(
     name = "invokedynamic",
     testonly = 1,
     srcs = ["invokedynamic/ClassWithLambda.java"],
-    javacopts = ["-source 8 -target 8"],
     tags = ["jdk8"],
 )
 
@@ -103,14 +101,14 @@ genrule(
 java_library(
     name = "typeannotations2",
     srcs = glob(["typeannotations2/**/*.java"]),
-    javacopts = ["-source 8 -target 8"],
     tags = ["jdk8"],
 )
 
 java_library(
     name = "methodparameters",
     srcs = ["methodparameters/Test.java"],
-    javacopts = ["-source 8 -target 8 -parameters"],
+    javacopts = ["-parameters"],
+    tags = ["jdk8"],
 )
 
 java_binary(
diff --git a/third_party/ijar/test/typeannotations2/java/lang/annotation/ElementType.java b/third_party/ijar/test/typeannotations2/java/lang/annotation/ElementType.java
deleted file mode 100644
index 634d69c4b6..0000000000
--- a/third_party/ijar/test/typeannotations2/java/lang/annotation/ElementType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package java.lang.annotation;
-
-/**
- * This is stub for the jdk8 ElementType. It allows the test to compile with a
- * jdk7 javabase.
- */
-public enum ElementType { TYPE_USE, TYPE_PARAMETER; }