OSDN Git Service

Add an explicit dependency on org.apache.http.legacy.
authorNarayan Kamath <narayan@google.com>
Fri, 13 Feb 2015 10:46:48 +0000 (10:46 +0000)
committerNarayan Kamath <narayan@google.com>
Fri, 13 Feb 2015 10:46:48 +0000 (10:46 +0000)
bug: 18027885
Change-Id: I94b14450807bdad2153078ac9a800863acf3177d

Android.mk

index 8a50335..c592046 100644 (file)
@@ -24,6 +24,10 @@ 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