[conflict] Merge "Switch to the source build of JavaPoet." am: 3a7f4760cf am: cd3404e9b7 am: df3036d061 am: 80cb6381ab am: cf0dcca29a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/2216866
Change-Id: Id4d3c458e06108163d71b6ab455b752e14f19a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.mk b/Android.mk
index 6e6bbd3..4e1ebf4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -127,7 +127,7 @@
LOCAL_ANNOTATION_PROCESSORS := \
auto_value_plugin \
- javapoet-prebuilt-jar \
+ javapoet \
dialer-common-m2-host-deps \
dialer-dagger2-compiler-deps \
dialer-glide-host-deps \
@@ -186,7 +186,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
dialer-common-m2-host-deps \
- javapoet-prebuilt-jar \
+ javapoet \
auto_service_annotations \
auto_common \
error_prone_annotations