From c4bd4e3e84714cfb2ccdb530fe00a786b868adbb Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Tue, 5 Sep 2017 10:53:21 -0700
Subject: Don't use guava prebuilts outside of annotations processing.

This results in class incompatiblity with other dependencies that are
transitively dependent on the same library.

Test: make, flash, th
Bug: 65254753
Change-Id: Ib32b088df60582df7559c9be49b0fa1b1f1a4fef
Merged-In: Idfbae76a38e64bb96eb824cda3d201ae63a13e90
---
 Android.mk | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/Android.mk b/Android.mk
index db0aed463..461f122c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -186,16 +186,16 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 	dialer-grpc-okhttp-target \
 	dialer-grpc-protobuf-lite-target \
 	dialer-grpc-stub-target \
-	dialer-guava-target \
 	dialer-javax-annotation-api-target \
 	dialer-javax-inject-target \
 	dialer-libshortcutbadger-target \
 	dialer-mime4j-core-target \
 	dialer-mime4j-dom-target \
+	guava \
 	jsr305 \
+	libbackup \
 	libphonenumber \
 	volley \
-	libbackup \
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
 	android-support-core-ui \
@@ -285,16 +285,6 @@ include $(BUILD_HOST_PREBUILT)
 # Dialer (java:sdk) should not link to dialer-guava (java:platform)
 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
-- 
cgit v1.2.3