summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-02-13 09:51:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-13 09:51:38 +0000
commit693d3a3639a854bc3d39bfb9f87550f5365e29b5 (patch)
tree409844a839ab4e3191253ea42d1833f270390ed8 /Android.mk
parentadec7c30f9206305b615710be48d4649831d8b2c (diff)
parenta8b46a3d3b6ed1488df10740653829283572903b (diff)
downloadandroid_external_apache-http-693d3a3639a854bc3d39bfb9f87550f5365e29b5.tar.gz
android_external_apache-http-693d3a3639a854bc3d39bfb9f87550f5365e29b5.tar.bz2
android_external_apache-http-693d3a3639a854bc3d39bfb9f87550f5365e29b5.zip
Merge "Move apache specific portions of android.net.http to apache-http."
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 463fb6b..f3eb679 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,8 +17,10 @@ LOCAL_PATH:= $(call my-dir)
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)