aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-11-28 15:54:32 +0000
committerPaul Duffin <paulduffin@google.com>2016-11-29 11:05:17 +0000
commitabb1d53c75cdbccd26a792e35be800991fd2f504 (patch)
treecd297c886a4ce7b1cbd6b4eb9bb1e3d3f1077a42
parent172e38f556e890d9f6dfcc06e2434852e5383f9d (diff)
downloadjunit-abb1d53c75cdbccd26a792e35be800991fd2f504.tar.gz
Added core-junit-static for use by frameworks/base/legacy-test
This is the same as core-junit but it is built for use in LOCAL_STATIC_JAVA_LIBRARIES. It is intended to be used by the legacy-test target and will be removed once the source files for the legacy JUnit classes that are built into core-junit are moved to frameworks/base/legacy-test. Bug: 30188076 Test: make checkbuild cts droid Change-Id: Ie0f441da14337669df4e6aa45c1e6b4bd59687dc
-rw-r--r--Android.mk13
1 files changed, 13 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 57a1c77..d2f1fb0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -79,6 +79,19 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.m
include $(BUILD_JAVA_LIBRARY)
# ----------------------------------
+# build a core-junit-static target jar that is embedded into legacy-test
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions)
+LOCAL_SRC_FILES += $(core-junit-files)
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj core-libart
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := core-junit-static
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# ----------------------------------
# build a core-junit-hostdex jar that contains exactly the same classes
# as core-junit.