From abb1d53c75cdbccd26a792e35be800991fd2f504 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Mon, 28 Nov 2016 15:54:32 +0000
Subject: 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
---
 Android.mk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Android.mk b/Android.mk
index 57a1c77..d2f1fb0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -78,6 +78,19 @@ LOCAL_MODULE := core-junit
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
 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.
-- 
cgit v1.2.3