Commit 90ccdd29 authored Sep 16, 2022 by Treehugger Robot Committed by Krzysztof Kosiński Sep 16, 2022

[conflict] Merge "Switch to the source build of JavaPoet." am: 3a7f4760 am:...

[conflict] Merge "Switch to the source build of JavaPoet." am: 3a7f4760 am: cd3404e9 am: df3036d0 am: 80cb6381 am: cf0dcca2

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>

parents 964df891 cf0dcca2

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ LOCAL_JAVA_LIBRARIES := \

		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_SRC_FILES := \

		LOCAL_STATIC_JAVA_LIBRARIES := \
		dialer-common-m2-host-deps \
		javapoet-prebuilt-jar \
		javapoet \
		auto_service_annotations \
		auto_common \
		error_prone_annotations