diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-27 18:17:35 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-02-12 11:15:49 +0000 |
| commit | 3bdd327f8532a79b83f575cc62e8eb09a1f93f3d (patch) | |
| tree | 92480de80f3818f6f1746df0ea719cf547324b22 /core/tests/coretests | |
| parent | 8b0c8ffb2d921ce5c90bcaaa3f1182d531d90d2c (diff) | |
| download | frameworks_base-3bdd327f8532a79b83f575cc62e8eb09a1f93f3d.zip frameworks_base-3bdd327f8532a79b83f575cc62e8eb09a1f93f3d.tar.gz frameworks_base-3bdd327f8532a79b83f575cc62e8eb09a1f93f3d.tar.bz2 | |
Move apache specific portions of android.net.http to external/apache-http.
We continue to compile external/apache-http into ext.jar. This contains
a few changes apart fom the classes moving around :
- Makefile changes to build docs and api-stubs for now. A future change
will revert these changes and remove these classes from stubs and
docs.
- Hardcode event IDs in legacyerrorstrings to avoid a dependency between
the frameworks and apache. These strings are on their way out and will
never change anyway.
- Remove imports due to {@link} tags and use {@code} instead.
- Remove an accidental(?) dependency on apache commons code that's a
part of apache-http.
bug: 18027885
Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
Diffstat (limited to 'core/tests/coretests')
| -rw-r--r-- | core/tests/coretests/Android.mk | 2 | ||||
| -rw-r--r-- | core/tests/coretests/AndroidManifest.xml | 1 |
2 files changed, 2 insertions, 1 deletions
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" /> |