Add an explicit dependency on org.apache.http.legacy.

bug: 18027885
Change-Id: I8e041025dc3f58b82ddce5b9ab2e3bdd3512cf00

diff --git a/Android.mk b/Android.mk
index 3d5663e..d3f4110 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -39,6 +39,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_MULTILIB := 32
 
+LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
+
 include $(BUILD_PACKAGE)
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7c290c7..234d39a 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -45,6 +45,7 @@
             android:restoreAnyVersion="true"
             android:supportsRtl="true">
         <uses-library android:name="com.google.android.media.effects" android:required="false" />
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
         <activity android:name="com.android.gallery3d.app.MovieActivity"
                 android:label="@string/movie_view_label"
                 android:configChanges="orientation|keyboardHidden|screenSize">