Use the provided javac for host_javabase=9

See #3410, #4812

Change-Id: Idd4adad7d48899c3b6de635d417446b71ba44afa

5 files changed, 14 insertions, 0 deletions

diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD
index cb1b4311db..977d05e8bd 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -12,8 +12,12 @@ filegroup(
     srcs = [
         "BUILD",
         "LICENSE",
+        "java_compiler.jar",
+        "java_compiler-src.jar",
         "javac-9+181-r4173-1.jar",
         "javac-9+181-r4173-1.srcjar",
+        "jdk_compiler.jar",
+        "jdk_compiler-src.jar",
     ],
 )
 
@@ -26,3 +30,13 @@ filegroup(
     name = "javac_jar",
     srcs = ["javac-9+181-r4173-1.jar"],
 )
+
+filegroup(
+    name = "jdk_compiler_jar",
+    srcs = ["jdk_compiler.jar"],
+)
+
+filegroup(
+    name = "java_compiler_jar",
+    srcs = ["java_compiler.jar"],
+)
diff --git a/third_party/java/jdk/langtools/java_compiler-src.jar b/third_party/java/jdk/langtools/java_compiler-src.jar
new file mode 100644
index 0000000000..5484124389
--- /dev/null
+++ b/third_party/java/jdk/langtools/java_compiler-src.jar
diff --git a/third_party/java/jdk/langtools/java_compiler.jar b/third_party/java/jdk/langtools/java_compiler.jar
new file mode 100644
index 0000000000..7b05002d5a
--- /dev/null
+++ b/third_party/java/jdk/langtools/java_compiler.jar
diff --git a/third_party/java/jdk/langtools/jdk_compiler-src.jar b/third_party/java/jdk/langtools/jdk_compiler-src.jar
new file mode 100644
index 0000000000..32ca99b398
--- /dev/null
+++ b/third_party/java/jdk/langtools/jdk_compiler-src.jar
diff --git a/third_party/java/jdk/langtools/jdk_compiler.jar b/third_party/java/jdk/langtools/jdk_compiler.jar
new file mode 100644
index 0000000000..cb6b34ca5a
--- /dev/null
+++ b/third_party/java/jdk/langtools/jdk_compiler.jar