commit 693f716f4993170dc589e507b2446b7856037377
author Ian Rogers <irogers@google.com> Fri Jun 13 20:54:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 13 20:54:34 2014 +0000
tree 9643c6f82b92e6a367c55b9a882bbe16fb92f4dc
parent 3b89d40b228cd36857cb11bd7fc7769b0cb4f943
parent 85ed0e10781c3c57343300a02556dd5131c450aa

am 85ed0e10: Merge "Remove deprecated WITH_HOST_DALVIK."

* commit '85ed0e10781c3c57343300a02556dd5131c450aa':
  Remove deprecated WITH_HOST_DALVIK.

Android.mk

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)