summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-08-18 13:02:42 -0700
committerEric Erfanian <erfanian@google.com>2017-08-18 13:02:42 -0700
commitcd235c2fa2f21a3e7d80d4b8e4370aeb26a617bb (patch)
tree55caf3f1cbf35e2a1a398e6113854e16491720e7
parentea3655aaf18b367c8ca35722656ff939a3739f42 (diff)
downloadplatform_external_libbackup-cd235c2fa2f21a3e7d80d4b8e4370aeb26a617bb.tar.gz
platform_external_libbackup-cd235c2fa2f21a3e7d80d4b8e4370aeb26a617bb.tar.bz2
platform_external_libbackup-cd235c2fa2f21a3e7d80d4b8e4370aeb26a617bb.zip
Use external/guava as the guava dependency.
Test: make Change-Id: Ibb736ceb8ca0e5ce4760dc819cebcea6ee17e4ba
-rw-r--r--Android.mk12
1 files changed, 1 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk
index a4bd6f8..1167e7e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,18 +13,8 @@ LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_BACKUP_LIB_SRCS),$(LOCAL_SRC_FILES))
LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4 \
-LOCAL_STATIC_JAVA_LIBRARIES := libbackup-guava
+LOCAL_STATIC_JAVA_LIBRARIES := guava
include $(BUILD_STATIC_JAVA_LIBRARY)
EXCLUDE_BACKUP_LIB_SRCS :=
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE := libbackup-guava
-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)