commit 0399abc79add384a7a8fd6a0b1aa94fcb9c8b51e
author Narayan Kamath <narayan@google.com> Mon Feb 08 17:04:51 2016 +0000
committer Narayan Kamath <narayan@google.com> Fri Feb 12 10:38:34 2016 +0000
tree 4f3862115986b78945aa2558f6e6bbea264c1e2c
parent 0cb30dd4fb486d9add3b1f8ff7a2b0a750cfcb28

apache-http: Fix stubs generation.

- We're asking doclava to generate stubs for all apache http packages.
  We must therefore point it to all apache-http sources (including the
  handful that live in frameworks/base).
- Stop asking for stubs for android.net.*. These classes are still
  public frameworks API and their stubs will be present in android.jar.

(cherry picked from commit 43ffae2b513e42623b213fbf08eea9255cb8ac7e)

Change-Id: I626459d4547ae14555435da8de73645e47a3461e

Android.mk

diff --git a/Android.mk b/Android.mk
index 9dffd55..7bfe9bb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -75,10 +75,31 @@
 # Generate the stub source files
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(apache_http_src_files)
+LOCAL_SRC_FILES += \
+    ../../frameworks/base/core/java/org/apache/http/conn/ConnectTimeoutException.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/scheme/HostNameResolver.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/scheme/LayeredSocketFactory.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/scheme/SocketFactory.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/ssl/AbstractVerifier.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/ssl/AndroidDistinguishedNameParser.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java \
+    ../../frameworks/base/core/java/org/apache/http/conn/ssl/X509HostnameVerifier.java \
+    ../../frameworks/base/core/java/org/apache/http/params/CoreConnectionPNames.java \
+    ../../frameworks/base/core/java/org/apache/http/params/HttpConnectionParams.java \
+    ../../frameworks/base/core/java/org/apache/http/params/HttpParams.java \
+    ../../frameworks/base/core/java/android/net/http/HttpResponseCache.java \
+    ../../frameworks/base/core/java/android/net/http/SslCertificate.java \
+    ../../frameworks/base/core/java/android/net/http/SslError.java \
+
+
 LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs)
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src \
-  $(LOCAL_PATH)/android
+  $(LOCAL_PATH)/android \
+  $(LOCAL_PATH)/../../frameworks/base/core/java/org/apache
 
 LOCAL_DROIDDOC_OPTIONS:= \
     -stubpackages $(subst $(space),:,$(apache_http_packages)) \