1 files changed, 7 insertions, 19 deletions
diff --git a/Android.bp b/Android.bp
index 7ef50b0..8302441 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,31 +49,19 @@ java_library_host {
     exclude_srcs: [
         ":google_java_format_main_srcs",
         "core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java",
+        "core/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatToolProvider.java",
     ],
     libs: [
         "error_prone_annotations",
         "google_java_format_android_annotation_stubs",
         "guava",
+        "auto_service_annotations",
+        "auto_value_annotations",
     ],
-    javacflags: [
-        "--add-modules=jdk.compiler",
-        "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-        "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
-    ],
-}
-
-java_library_host {
-    name: "google_java_format_filer",
-    srcs: ["core/src/main/java/filer/*.java"],
-    libs: [
-        "error_prone_annotations",
-        "google_java_format_android_annotation_stubs",
-        "guava",
+    plugins: [
+        "auto_oneof_plugin",
+        "auto_service_plugin",
+        "auto_value_plugin",
     ],
     javacflags: [
         "--add-modules=jdk.compiler",