summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Heidepriem <zachh@google.com>2017-11-10 12:01:42 -0800
committerZachary Heidepriem <zachh@google.com>2017-11-10 12:02:51 -0800
commit06fcdc39c6fc7667481e5ec91466fa256bd1fab6 (patch)
tree3f3385eb430dfe229dad0424477d690161a2553f
parent4599ef0948368d2e10f11ec69f697095e64e8e38 (diff)
downloadplatform_external_libbackup-06fcdc39c6fc7667481e5ec91466fa256bd1fab6.tar.gz
platform_external_libbackup-06fcdc39c6fc7667481e5ec91466fa256bd1fab6.tar.bz2
platform_external_libbackup-06fcdc39c6fc7667481e5ec91466fa256bd1fab6.zip
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
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 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 :=