diff options
| author | Colin Cross <ccross@android.com> | 2022-03-08 01:12:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 01:12:25 +0000 |
| commit | 0eb108a34e4564bf3b565fc7990c24f551a4b987 (patch) | |
| tree | fcee97d43c1f3f2516ad353aaff95a30ba19bffa | |
| parent | f7bf978b9fbd4afb0c808d4fd72a744c6d46520b (diff) | |
| parent | 4522ed74d735f0518b4dce2565c97fc636d8f3ba (diff) | |
| download | google-java-format-0eb108a34e4564bf3b565fc7990c24f551a4b987.tar.gz | |
Update Android.bp for upstream merge am: ef76c3a89b am: 4522ed74d7
Original change: https://android-review.googlesource.com/c/platform/external/google-java-format/+/2008224
Change-Id: Ia496f79739b49fbf3b3e3086dd64ac0afa6125b8
| -rw-r--r-- | Android.bp | 26 |
1 files changed, 7 insertions, 19 deletions
@@ -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", |