diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-13 15:57:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-12 21:07:49 +0000 |
| commit | a0af71c0b361025bdcea7792a6bc76e57e51653c (patch) | |
| tree | 982d02411df71803279ca5283f07d8bd596d0184 | |
| parent | 490db688eaa8e162a4dd59f9aa491bf4520c46db (diff) | |
| parent | f5eed49eb318c94eefbfd840f7eaac159983e060 (diff) | |
| download | apache-xml-a0af71c0b361025bdcea7792a6bc76e57e51653c.tar.gz | |
Merge "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) |