aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk14
1 files changed, 11 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 781b2b2..c42a558 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,12 +19,20 @@ LOCAL_PATH := $(call my-dir)
# include definition of core-junit-files
include $(LOCAL_PATH)/Common.mk
-# note: ideally this should be junit-host, but leave as is for now to avoid
-# changing all its dependencies
+# note: this is deprecated in favour of junit-host; this will be removed soon.
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE := junit
LOCAL_MODULE_TAGS := optional
+LOCAL_STATIC_JAVA_LIBRARIES := junit-host
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+# build a junit-host jar
+# ----------------------
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_MODULE := junit-host
+LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-host
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
include $(BUILD_HOST_JAVA_LIBRARY)