aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-11-29 13:05:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-29 13:05:21 +0000
commit25fe9e56f7240635dce8ed52887232c89b56e0e4 (patch)
treecd297c886a4ce7b1cbd6b4eb9bb1e3d3f1077a42
parent924ea5919a9cf48811ad5ba58524f509982d6b7b (diff)
parent0547748be095602ffee6b68e9c2299a369dacfb6 (diff)
downloadjunit-25fe9e56f7240635dce8ed52887232c89b56e0e4.tar.gz
Merge "Added core-junit-static for use by frameworks/base/legacy-test"
am: 0547748be0 Change-Id: Ia82b9c24fae4e8eeac4322d22156e0cffb6ef8a0
-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.