X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=745a2ad67e7d2f0114b329c34577a59c6e3bccb1;hb=refs%2Fheads%2Foreo-x86;hp=c5920466515541caed3014036547910415af8cda;hpb=04ce3c549e84b2ff0cdaeb1c28418542efea1483;p=android-x86%2Fpackages-apps-Camera2.git

diff --git a/Android.mk b/Android.mk
index c59204665..745a2ad67 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += glide
+LOCAL_STATIC_JAVA_LIBRARIES += guava
+LOCAL_STATIC_JAVA_LIBRARIES += jsr305
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
@@ -24,16 +26,15 @@ LOCAL_AAPT_FLAGS := \
         --version-name "$(version_name_package)" \
         --version-code $(version_code_package) \
 
-# Indirect dependency on apache due to glide, which pulls in
-# volley.
-LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
-
 LOCAL_PACKAGE_NAME := Camera2
 
 LOCAL_SDK_VERSION := current
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+# Guava uses deprecated org.apache.http.legacy classes.
+LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
+
 LOCAL_JNI_SHARED_LIBRARIES := libjni_tinyplanet libjni_jpegutil
 
 include $(BUILD_PACKAGE)