Use prebuilt guava for dialer.
We are now using guava APIs from guava 20, and AOSP guava is stuck at 18.
Test: mma
Change-Id: Ie053a5d8a30a41c7ce0deaaa01a3e17febc651cf
diff --git a/Android.mk b/Android.mk
index 094ad5a..9defc7e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -184,7 +184,7 @@
dialer-libshortcutbadger-target \
dialer-mime4j-core-target \
dialer-mime4j-dom-target \
- guava \
+ dialer-guava-target \
jsr305 \
libbackup \
libphonenumber \
@@ -278,6 +278,16 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-guava-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE := dialer-dagger2-target
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX)