summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-11-07 17:39:01 -0800
committerSteve Kondik <steve@cyngn.com>2015-11-07 17:39:17 -0800
commit8839806b8a13e0f76bee45e9a164ef2cd96bf2fd (patch)
treeabbe390bbc176ab2d483995fc72837d45bdadcfc
parentf3aaaae0cef50cf8627f19872e72e04f5362bbaa (diff)
downloadandroid_external_apache-http-8839806b8a13e0f76bee45e9a164ef2cd96bf2fd.tar.gz
android_external_apache-http-8839806b8a13e0f76bee45e9a164ef2cd96bf2fd.tar.bz2
android_external_apache-http-8839806b8a13e0f76bee45e9a164ef2cd96bf2fd.zip
Change-Id: I504ca6f0d00fe059c2a3454bceaff365917d54d6
-rw-r--r--Android.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 2f528fc..fe2b83f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,7 @@ apache_http_src_files := \
$(call all-java-files-under,src) \
$(call all-java-files-under,android)
-apache_http_java_libs := conscrypt tcmiface
+apache_http_java_libs := conscrypt
apache_http_packages := $(strip \
com.android.internal.http.multipart \
@@ -65,7 +65,8 @@ apache_http_packages := $(strip \
include $(CLEAR_VARS)
LOCAL_MODULE := org.apache.http.legacy.boot
LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs) tcmiface
+LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs)
+LOCAL_STATIC_JAVA_LIBRARIES := tcmiface
LOCAL_SRC_FILES := $(apache_http_src_files)
LOCAL_SDK_VERSION := 21
LOCAL_MODULE_TAGS := optional
@@ -75,7 +76,7 @@ include $(BUILD_JAVA_LIBRARY)
# Generate the stub source files
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(apache_http_src_files)
-LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs)
+LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs) tcmiface
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src \
$(LOCAL_PATH)/android
@@ -99,6 +100,7 @@ ifeq (,$(TARGET_BUILD_APPS))
include $(CLEAR_VARS)
LOCAL_MODULE := org.apache.http.legacy
LOCAL_SOURCE_FILES_ALL_GENERATED := true
+LOCAL_JAVA_LIBRARIES := tcmiface
LOCAL_SDK_VERSION := 21
include $(BUILD_STATIC_JAVA_LIBRARY)