diff options
| author | Elliott Hughes <enh@google.com> | 2012-12-04 14:06:37 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-12-04 14:06:37 -0800 |
| commit | 8badf4d23f7b3a0d1884934fa92955bc69638d76 (patch) | |
| tree | d4b2f047a69d2e279a695e0490684135738f34b2 | |
| parent | ad23d045f4d10276b41e25610e8a8597cd4bfb63 (diff) | |
| download | junit-8badf4d23f7b3a0d1884934fa92955bc69638d76.tar.gz | |
Fix the Mac build by adding a WITH_HOST_DALVIK test.
Change-Id: I75d4bf9e81661aca6363e9249dd04e5f2f9ecd8f
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -46,13 +46,12 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-junit include $(BUILD_JAVA_LIBRARY) -ifeq ($(WITH_HOST_DALVIK),true) # ---------------------------------- # build a core-junit-hostdex jar that contains exactly the same classes # as core-junit. +ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) - # TODO: remove extensions once apache-harmony/luni/ is no longer dependent # on it LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions) @@ -64,7 +63,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-junit-hostdex LOCAL_BUILD_HOST_DEX := true include $(BUILD_HOST_JAVA_LIBRARY) - endif #------------------------------------------------------- @@ -81,6 +79,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # build a junit-runner for the host dalvikvm # (like the junit classes in the frameworks/base android.test.runner.jar) +ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(junit-runner-files) LOCAL_MODULE := junit-runner-hostdex @@ -88,6 +87,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_BUILD_HOST_DEX := true LOCAL_JAVA_LIBRARIES := core-junit-hostdex include $(BUILD_HOST_JAVA_LIBRARY) +endif #------------------------------------------------------- # build a junit4-target jar representing the |