diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-13 09:51:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-13 09:51:44 +0000 |
| commit | f129af204cd29801483e12887c5e10032292cc76 (patch) | |
| tree | dc3876096cdd1670a02287a954b1395a461d2689 /core/tests | |
| parent | 0a3dd9c9e0aa0f8558c9631c95effe49a4ce202d (diff) | |
| parent | 3bdd327f8532a79b83f575cc62e8eb09a1f93f3d (diff) | |
| download | frameworks_base-f129af204cd29801483e12887c5e10032292cc76.zip frameworks_base-f129af204cd29801483e12887c5e10032292cc76.tar.gz frameworks_base-f129af204cd29801483e12887c5e10032292cc76.tar.bz2 | |
Merge "Move apache specific portions of android.net.http to external/apache-http."
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/bandwidthtests/Android.mk | 4 | ||||
| -rw-r--r-- | core/tests/bandwidthtests/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | core/tests/coretests/Android.mk | 2 | ||||
| -rw-r--r-- | core/tests/coretests/AndroidManifest.xml | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/core/tests/bandwidthtests/Android.mk b/core/tests/bandwidthtests/Android.mk index 6871efd..cb44721 100644 --- a/core/tests/bandwidthtests/Android.mk +++ b/core/tests/bandwidthtests/Android.mk @@ -22,9 +22,9 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := \ $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy LOCAL_PACKAGE_NAME := BandwidthTests include $(BUILD_PACKAGE) -include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/core/tests/bandwidthtests/AndroidManifest.xml b/core/tests/bandwidthtests/AndroidManifest.xml index 24221bc..d0a6198 100644 --- a/core/tests/bandwidthtests/AndroidManifest.xml +++ b/core/tests/bandwidthtests/AndroidManifest.xml @@ -19,6 +19,7 @@ <application > <uses-library android:name="android.test.runner" /> + <uses-library android:name="org.apache.http.legacy" android:required="false" /> </application> <instrumentation diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index 6bdeaf0..79a0b0c 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := \ LOCAL_DX_FLAGS := --core-library LOCAL_AAPT_FLAGS = -0 dat -0 gld LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support android-common frameworks-core-util-lib mockwebserver guava littlemock mockito-target -LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common +LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common org.apache.http.legacy LOCAL_PACKAGE_NAME := FrameworksCoreTests LOCAL_CERTIFICATE := platform diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index 226717e..bfaea8f 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -112,6 +112,7 @@ <application android:theme="@style/Theme"> <uses-library android:name="android.test.runner" /> + <uses-library android:name="org.apache.http.legacy" android:required="false" /> <activity android:name="android.view.ViewAttachTestActivity" android:label="View Attach Test"> <intent-filter> <action android:name="android.intent.action.MAIN" /> |