commit b07374d75872c460a62a41e8d2b5aab12bfdd9d1
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 d155ef562ce027de62bfa2118778480f1fba0b53
parent da967c18653419ec64d3c3ec48006ceeee666757

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/tests/media/Android.mk

diff --git a/tests/tests/media/Android.mk b/tests/tests/media/Android.mk
index 77d4bb7..43e3e89 100644
--- a/tests/tests/media/Android.mk
+++ b/tests/tests/media/Android.mk
@@ -49,7 +49,7 @@
 
 # uncomment when b/13249737 is fixed
 #LOCAL_SDK_VERSION := current
-LOCAL_JAVA_LIBRARIES += android.test.runner
+LOCAL_JAVA_LIBRARIES += android.test.runner org.apache.http.legacy
 
 include $(BUILD_CTS_PACKAGE)