summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-06-13 15:56:43 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-06-12 05:34:11 +0000
commit85ed0e10781c3c57343300a02556dd5131c450aa (patch)
tree9643c6f82b92e6a367c55b9a882bbe16fb92f4dc
parentdb97129042e7baaab6eda49138d9328f1217aaca (diff)
parent2da27d6d7d181af2967a328a5cba522b7c26cbda (diff)
downloadandroid_external_apache-http-85ed0e10781c3c57343300a02556dd5131c450aa.tar.gz
android_external_apache-http-85ed0e10781c3c57343300a02556dd5131c450aa.tar.bz2
android_external_apache-http-85ed0e10781c3c57343300a02556dd5131c450aa.zip
Merge "Remove deprecated WITH_HOST_DALVIK."
-rw-r--r--Android.mk14
1 files changed, 6 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk
index 25f5027..82bd472 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,11 +16,9 @@
LOCAL_PATH:= $(call my-dir)
# frameworks builds apache-http as part of ext.jar for the device, but
# here we just build apache-http alone for the host build
-ifeq ($(WITH_HOST_DALVIK),true)
- include $(CLEAR_VARS)
- LOCAL_MODULE := apachehttp-hostdex
- LOCAL_MODULE_TAGS := optional
- LOCAL_SRC_FILES := $(call all-java-files-under,src)
- LOCAL_MODULE_TAGS := optional
- include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
-endif
+include $(CLEAR_VARS)
+LOCAL_MODULE := apachehttp-hostdex
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-java-files-under,src)
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)