Update Android.bp for upstream merge am: ef76c3a89b am: 4522ed74d7 am: 0eb108a34e
Original change: https://android-review.googlesource.com/c/platform/external/google-java-format/+/2008224
Change-Id: I2a5959c39d8226ac8d12e8b92a84d9fbfe4b99e5
diff --git a/Android.bp b/Android.bp
index 7ef50b0..8302441 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,31 +49,19 @@
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",