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

2015-02-10 16:18:01 +00:00
parent 38828f1684 4b952f0df3
commit 82ac77349d
2 changed files with 2 additions and 1 deletions
--- a/apps/Development/Android.mk
+++ b/apps/Development/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)

 LOCAL_MODULE_TAGS := eng

-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
+LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common org.apache.http.legacy

 LOCAL_SRC_FILES := $(call all-subdir-java-files) \
                src/com/android/development/IRemoteService.aidl \
--- a/apps/Development/AndroidManifest.xml
+++ b/apps/Development/AndroidManifest.xml
@@ -47,6 +47,7 @@

    <application android:label="Dev Tools"
            android:icon="@mipmap/ic_launcher_devtools">
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />

        <uses-library android:name="android.test.runner" />