From 06fcdc39c6fc7667481e5ec91466fa256bd1fab6 Mon Sep 17 00:00:00 2001 From: Zachary Heidepriem Date: Fri, 10 Nov 2017 12:01:42 -0800 Subject: Remove guava from libbackup dep. It is only used in shadows, which are excluded srcs. Removing guava dep allows dialer to depend on its own current version of guava without there being class verison conflicts. Change-Id: I141a8a9642b1cf24351d095da6b8b85d5979da7b Test: mma --- Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/Android.mk b/Android.mk index 1167e7e..945a03b 100644 --- a/Android.mk +++ b/Android.mk @@ -13,8 +13,6 @@ LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_BACKUP_LIB_SRCS),$(LOCAL_SRC_FILES)) LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4 \ -LOCAL_STATIC_JAVA_LIBRARIES := guava - include $(BUILD_STATIC_JAVA_LIBRARY) EXCLUDE_BACKUP_LIB_SRCS := -- cgit v1.2.3