Move apache specific portions of android.net.http to apache-http.
.. and move some parts of apache-http into the framework. The parts that
have been moved need to be in the bootclasspath because we have public API
that returns org.apache.http.conn.ssl.SSLSocketFactory :( .
This change also removes the placeholder library shim.
bug: 18027885
Change-Id: I37aa7562bcd5e05191b83676fae4533e03b86d1d
diff --git a/Android.mk b/Android.mk
index 463fb6b..f3eb679 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,8 +17,10 @@
include $(CLEAR_VARS)
LOCAL_MODULE := org.apache.http.legacy
LOCAL_MODULE_TAGS := optional
+LOCAL_JAVA_LIBRARIES := conscrypt
LOCAL_SRC_FILES := \
- $(call all-java-files-under,placeholder)
+ $(call all-java-files-under,src) \
+ $(call all-java-files-under,android)
LOCAL_MODULE_TAGS := optional
include $(BUILD_JAVA_LIBRARY)