commit 1888a3a55a0a62629abf98eb5771ad3f55bb7ea1
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 982d02411df71803279ca5283f07d8bd596d0184
parent 4d84179f6dcd5a546d292141ede7ff32631f3aec
parent a0af71c0b361025bdcea7792a6bc76e57e51653c

am a0af71c0: Merge "Remove deprecated WITH_HOST_DALVIK."

* commit 'a0af71c0b361025bdcea7792a6bc76e57e51653c':
  Remove deprecated WITH_HOST_DALVIK.

Android.mk

diff --git a/Android.mk b/Android.mk
index f076f0c..2603ee0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,13 +27,11 @@
 LOCAL_JAVA_RESOURCE_DIRS := src/main/java
 include $(BUILD_JAVA_LIBRARY)
 
-ifeq ($(WITH_HOST_DALVIK),true)
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := apache-xml-hostdex
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_SRC_FILES := $(apache-xml_src_files)
-    LOCAL_JAVACFLAGS := -encoding UTF-8
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_JAVA_RESOURCE_DIRS := src/main/java
-    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
-endif
+include $(CLEAR_VARS)
+LOCAL_MODULE := apache-xml-hostdex
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(apache-xml_src_files)
+LOCAL_JAVACFLAGS := -encoding UTF-8
+LOCAL_MODULE_TAGS := optional
+LOCAL_JAVA_RESOURCE_DIRS := src/main/java
+include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)