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 /Android.mk | |
| 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 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -614,7 +614,10 @@ $(gen): $(aidl_files) | $(AIDL) # TODO: deal with com/google/android/googleapps packages_to_document := \ android \ - javax/microedition/khronos + javax/microedition/khronos \ + org/apache/http/conn \ + org/apache/http/params + # Search through the base framework dirs for these packages. # The result will be relative to frameworks/base. @@ -635,7 +638,6 @@ include libcore/Docs.mk include external/junit/Common.mk non_base_dirs := \ - ../../external/apache-http/src/org/apache/http \ ../opt/telephony/src/java/android/provider \ ../opt/telephony/src/java/android/telephony \ ../opt/telephony/src/java/android/telephony/gsm \ @@ -1024,13 +1026,8 @@ include $(BUILD_DROIDDOC) # Build ext.jar # ============================================================ -# NOTICE notes for non-obvious sections -# apache-http - covered by the Apache Commons section. - - ext_dirs := \ ../../external/nist-sip/java \ - ../../external/apache-http/src \ ../../external/tagsoup/src \ ext_src_files := $(call all-java-files-under,$(ext_dirs)) |