commit 505728b35af4617c647fec742b8eaeadd4009894
author Narayan Kamath <narayan@google.com> Fri Dec 12 10:55:51 2014 +0000
committer Narayan Kamath <narayan@google.com> Fri Feb 06 13:56:30 2015 +0000
tree 92ba369c12990d4dcd1e28f08e7adbca60c3c6a5
parent 08d039bc85b677a6c3c1df42c810d0acae98f64e

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

tests/cts/net/Android.mk

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