Clean up javac and Error Prone targets

now that the upgrade is complete. The targets with suffixes were added
to make a two-step migration possible. Now that the migration is done
the suffix-less targets can provide the new versions, and the suffixed
targets can be directed to the un-suffixed targets until they are
removed.

Change-Id: I5632b14924df6a83a23e3f564d483f4925f72d08

3 files changed, 13 insertions, 26 deletions

diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD
index bb4070eb2c..f0f57c20fd 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -19,54 +19,41 @@ filegroup(
         "//conditions:default": [
             "BUILD",
             "LICENSE",
-            "javac-9-dev-r3297-4.jar",
-            "javac-9-dev-r3297-4.srcjar",
+            "javac-9-dev-r4023-1.jar",
+            "javac-9-dev-r4023-1.srcjar",
         ],
     }),
 )
 
 java_import(
     name = "javac",
-    jars = ["javac-9-dev-r3297-4.jar"],
+    jars = ["javac-9-dev-r4023-1.jar"],
 )
 
 filegroup(
     name = "javac_jar",
     srcs = select({
         "//tools/jdk:jdk7": ["javac7.jar"],
-        "//conditions:default": ["javac-9-dev-r3297-4.jar"],
+        "//conditions:default": ["javac-9-dev-r4023-1.jar"],
     }),
 )
 
-filegroup(
+# TODO(cushon): delete
+alias(
     name = "test-srcs-9-dev-r4023-1",
-    srcs = select({
-        "//tools/jdk:jdk7": [
-            "BUILD",
-            "LICENSE",
-            "javac7.jar",
-            "javac7.srcjar",
-        ],
-        "//conditions:default": [
-            "BUILD",
-            "LICENSE",
-            "javac-9-dev-r4023-1.jar",
-            "javac-9-dev-r4023-1.srcjar",
-        ],
-    }),
+    actual = ":test-srcs",
 )
 
-java_import(
+# TODO(cushon): delete
+alias(
     name = "javac-9-dev-r4023-1",
-    jars = ["javac-9-dev-r4023-1.jar"],
+    actual = ":javac",
 )
 
-filegroup(
+# TODO(cushon): delete
+alias(
     name = "javac_jar-9-dev-r4023-1",
-    srcs = select({
-        "//tools/jdk:jdk7": ["javac7.jar"],
-        "//conditions:default": ["javac-9-dev-r4023-1.jar"],
-    }),
+    actual = ":javac_jar",
 )
 
 java_import(
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
deleted file mode 100644
index 6e4ae449ed..0000000000
--- a/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
+++ /dev/null
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar
deleted file mode 100644
index c2ca60349b..0000000000
--- a/third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar
+++ /dev/null