1 files changed, 9 insertions, 19 deletions
diff --git a/kythe/java/com/google/devtools/kythe/extractors/java/standalone/BUILD b/kythe/java/com/google/devtools/kythe/extractors/java/standalone/BUILD
index 41502710f..8b1a2f9f4 100644
--- a/kythe/java/com/google/devtools/kythe/extractors/java/standalone/BUILD
+++ b/kythe/java/com/google/devtools/kythe/extractors/java/standalone/BUILD
@@ -7,23 +7,12 @@ exports_files(["javac-wrapper.sh"])
 
 java_binary(
     name = "javac_extractor",
-    srcs = ["Javac8Wrapper.java"],
-    main_class = "com.google.devtools.kythe.extractors.java.standalone.Javac8Wrapper",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":abstract_javac_wrapper",
-        "//kythe/java/com/google/devtools/kythe/extractors/java",
-        "//kythe/java/com/google/devtools/kythe/extractors/shared",
-        "//kythe/java/com/google/devtools/kythe/extractors/shared:environment",
-        "//kythe/proto:storage_java_proto",
-        "//third_party/guava",
-        "//third_party/javac",
-    ],
-)
-
-java_binary(
-    name = "javac9_extractor",
     srcs = ["Javac9Wrapper.java"],
+    javacopts = [
+        "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+        "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+        "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+    ],
     main_class = "com.google.devtools.kythe.extractors.java.standalone.Javac9Wrapper",
     visibility = ["//visibility:public"],
     deps = [
@@ -33,13 +22,15 @@ java_binary(
         "//kythe/java/com/google/devtools/kythe/extractors/shared:environment",
         "//kythe/proto:storage_java_proto",
         "//third_party/guava",
-        "//third_party/javac:javac9",
     ],
 )
 
 java_library(
     name = "abstract_javac_wrapper",
     srcs = ["AbstractJavacWrapper.java"],
+    javacopts = [
+        "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+    ],
     deps = [
         "//kythe/java/com/google/devtools/kythe/extractors/java",
         "//kythe/java/com/google/devtools/kythe/extractors/shared",
@@ -48,8 +39,7 @@ java_library(
         "//kythe/java/com/google/devtools/kythe/util:json",
         "//kythe/proto:analysis_java_proto",
         "//third_party/guava",
-        "//third_party/javac",
-        "@com_google_common_flogger//api",
+        "@maven//:com_google_flogger_flogger",
     ],
 )