From 4b952f0df30256146a1b6ba03761978bc982c305 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Thu, 5 Feb 2015 15:04:30 +0000
Subject: [PATCH] Add an explicit dependency on org.apache.http.legacy.

bug: 18027885
Change-Id: Ie3a251fd63ec25a3c5cb46c80236f43724166331
---
 apps/Development/Android.mk          | 2 +-
 apps/Development/AndroidManifest.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/Development/Android.mk b/apps/Development/Android.mk
index 8c0f705bf..99133e85f 100644
--- 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 \
diff --git a/apps/Development/AndroidManifest.xml b/apps/Development/AndroidManifest.xml
index 5847201ae..3ac819077 100644
--- 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" />