Merge "Fix the Mac build by adding a WITH_HOST_DALVIK test."
diff --git a/Android.mk b/Android.mk
index 425d0a1..6e07bc5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,13 +46,12 @@
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 := core-junit-hostdex
LOCAL_BUILD_HOST_DEX := true
include $(BUILD_HOST_JAVA_LIBRARY)
-
endif
#-------------------------------------------------------
@@ -81,6 +79,7 @@
# 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_BUILD_HOST_DEX := true
LOCAL_JAVA_LIBRARIES := core-junit-hostdex
include $(BUILD_HOST_JAVA_LIBRARY)
+endif
#-------------------------------------------------------
# build a junit4-target jar representing the
