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 | 1888a3a55a0a62629abf98eb5771ad3f55bb7ea1 (patch) | |
| tree | 982d02411df71803279ca5283f07d8bd596d0184 | |
| parent | 4d84179f6dcd5a546d292141ede7ff32631f3aec (diff) | |
| parent | a0af71c0b361025bdcea7792a6bc76e57e51653c (diff) | |
| download | apache-xml-1888a3a55a0a62629abf98eb5771ad3f55bb7ea1.tar.gz | |
am a0af71c0: Merge "Remove deprecated WITH_HOST_DALVIK."
* commit 'a0af71c0b361025bdcea7792a6bc76e57e51653c':
Remove deprecated WITH_HOST_DALVIK.
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -27,13 +27,11 @@ LOCAL_NO_STANDARD_LIBRARIES := true 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) |