diff options
| author | Narayan Kamath <narayan@google.com> | 2013-11-25 19:03:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-25 19:03:40 +0000 |
| commit | 0ac936f8a545a81f436af890ef7e408bd3db6316 (patch) | |
| tree | 8448535887a8594be625ed5d579a6472248b4f01 | |
| parent | 06e71cf13d88c15cf54b6459da5875d3b411c0ad (diff) | |
| parent | c2140d6b308fb9b0bf3126d3bceb4ef4fdd63373 (diff) | |
| download | junit-0ac936f8a545a81f436af890ef7e408bd3db6316.tar.gz | |
Merge "Remove uses of LOCAL_BUILD_HOST_DEX"
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -59,8 +59,7 @@ LOCAL_SRC_FILES += $(core-junit-files) LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-junit-hostdex -LOCAL_BUILD_HOST_DEX := true -include $(BUILD_HOST_JAVA_LIBRARY) +include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif #------------------------------------------------------- @@ -82,9 +81,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(junit-runner-files) LOCAL_MODULE := junit-runner-hostdex LOCAL_MODULE_TAGS := optional -LOCAL_BUILD_HOST_DEX := true LOCAL_JAVA_LIBRARIES := core-junit-hostdex -include $(BUILD_HOST_JAVA_LIBRARY) +include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif #------------------------------------------------------- |