aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-11-25 13:18:10 +0000
committerPaul Duffin <paulduffin@google.com>2016-11-25 15:04:35 +0000
commit8e4aa75bbd968cdbc04c7e1bcbc1cbe0df62740e (patch)
treeecb6451d2d568815b5659c2b48b0ed9747bfb301 /Android.mk
parent743bb726af7be56d3e99dcec6443d81248e12e30 (diff)
downloadjunit-8e4aa75bbd968cdbc04c7e1bcbc1cbe0df62740e.tar.gz
Change junit-hostdex to contain all JUnit classes
Bug: 30188076 Test: make checkbuild Change-Id: I42b96dc6ca05e506a164a7aad1b75b7eaf4e18cf
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index c42a558..a9132e8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,15 +53,15 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/junit
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
include $(BUILD_JAVA_LIBRARY)
-# ----------------------------------
# build a junit-hostdex jar
+# -------------------------
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions)
-LOCAL_SRC_FILES += $(core-junit-files)
-LOCAL_SRC_FILES += $(junit-runner-files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE := junit-hostdex
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-hostdex
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
endif # HOST_OS == linux