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 /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 'tests/CoreTests')
| -rw-r--r-- | tests/CoreTests/android/Android.mk | 2 | ||||
| -rw-r--r-- | tests/CoreTests/android/AndroidManifest.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/CoreTests/android/Android.mk b/tests/CoreTests/android/Android.mk index bc0e4e4..5f3d0d9 100644 --- a/tests/CoreTests/android/Android.mk +++ b/tests/CoreTests/android/Android.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := \ $(call all-subdir-java-files) -LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt +LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt org.apache.http.legacy LOCAL_PACKAGE_NAME := CoreTests diff --git a/tests/CoreTests/android/AndroidManifest.xml b/tests/CoreTests/android/AndroidManifest.xml index 8331f0c..bf46d15 100644 --- a/tests/CoreTests/android/AndroidManifest.xml +++ b/tests/CoreTests/android/AndroidManifest.xml @@ -35,6 +35,7 @@ <application> <uses-library android:name="android.test.runner" /> + <uses-library android:name="org.apache.http.legacy" android:required="false" /> </application> <instrumentation |