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: Idfbae76a38e64bb96eb824cda3d201ae63a13e90
diff --git a/Android.mk b/Android.mk
index beaa2c5..ba74297 100644
--- a/Android.mk
+++ b/Android.mk
@@ -191,16 +191,16 @@
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 \
@@ -299,16 +299,6 @@
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)