Add explicit dependencies on org.apache.http.legacy
Test modules that depend on the CTS testserver must declare
explicit dependencies on org.apache.http.legacy.
Also fix some bizarre build rules; ctstestserver builds directly
against the framework but compiled into apps that target SDK 16.
bug: 18027885
Change-Id: I905942d8ed71812499df94e3e5970c0b08716528
diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index f6e5c90..a35e145 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -24,7 +24,7 @@
# Include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_JAVA_LIBRARIES := voip-common conscrypt
+LOCAL_JAVA_LIBRARIES := voip-common conscrypt org.apache.http.legacy
LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni
diff --git a/tests/cts/net/AndroidManifest.xml b/tests/cts/net/AndroidManifest.xml
index 652262d..bca2d2c 100644
--- a/tests/cts/net/AndroidManifest.xml
+++ b/tests/cts/net/AndroidManifest.xml
@@ -30,6 +30,7 @@
<application>
<uses-library android:name="android.test.runner" />
+ <uses-library android:name="org.apache.http.legacy" android:required="false" />
</application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"