Fix glide makefile
Dagger bundles javapoet 1.7.0 while glide needs 1.8.0
Added the dependency above dagger.
Test: make
Change-Id: I31ef9fbcaf0c86672ced9ade9f366c7d96f2617c
diff --git a/Android.mk b/Android.mk
index 9014a05..c69a090 100644
--- a/Android.mk
+++ b/Android.mk
@@ -109,6 +109,8 @@
dialer-mime4j-dom-target \
dialer-error-prone-target \
dialer-guava-target \
+ dialer-glide-target \
+ dialer-glide-annotation-target \
jsr305 \
libbackup \
libphonenumber \
@@ -130,11 +132,12 @@
LOCAL_ANNOTATION_PROCESSORS := \
dialer-auto-value \
+ dialer-javapoet \
dialer-dagger2 \
dialer-dagger2-compiler \
dialer-dagger2-producers \
- dialer-glide-compiler \
dialer-glide-annotation \
+ dialer-glide-compiler \
dialer-guava \
dialer-javax-annotation-api \
dialer-javax-inject \
@@ -197,7 +200,8 @@
dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3.jar \
dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/23.0/guava-23.0.jar \
dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar \
- dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar
+ dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar \
+ dialer-javapoet:../../../prebuilts/tools/common/m2/repository/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar \
include $(BUILD_HOST_PREBUILT)
@@ -266,6 +270,16 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-glide-annotation-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE := dialer-javax-annotation-api-target
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar