From ea7ea2b1debdc6f3f859afe1b5283d774089faa6 Mon Sep 17 00:00:00 2001
From: Ta-wei Yen <twyen@google.com>
Date: Thu, 8 Feb 2018 18:03:40 -0800
Subject: 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
---
 Android.mk | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 9014a05ee..c69a0903a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -109,6 +109,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 	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_JAVA_LIBRARIES := \
 
 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 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
     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)
 
@@ -265,6 +269,16 @@ include $(BUILD_PREBUILT)
 
 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
-- 
cgit v1.2.3