LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add explicit dependencies on org.apache.http.legacy

Browse Source 
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
This commit is contained in:
Narayan Kamath
2014-12-12 10:55:51 +00:00
parent 08d039bc85
commit 505728b35a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/net/Android.mk
View File

@@ -24,7 +24,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
# 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

1
tests/cts/net/AndroidManifest.xml
View File

@@ -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"