diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-13 20:54:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-13 20:54:34 +0000 |
| commit | 693f716f4993170dc589e507b2446b7856037377 (patch) | |
| tree | 9643c6f82b92e6a367c55b9a882bbe16fb92f4dc | |
| parent | 3b89d40b228cd36857cb11bd7fc7769b0cb4f943 (diff) | |
| parent | 85ed0e10781c3c57343300a02556dd5131c450aa (diff) | |
| download | android_external_apache-http-693f716f4993170dc589e507b2446b7856037377.tar.gz android_external_apache-http-693f716f4993170dc589e507b2446b7856037377.tar.bz2 android_external_apache-http-693f716f4993170dc589e507b2446b7856037377.zip | |
am 85ed0e10: Merge "Remove deprecated WITH_HOST_DALVIK."
* commit '85ed0e10781c3c57343300a02556dd5131c450aa':
Remove deprecated WITH_HOST_DALVIK.
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -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) |