Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Change-Id: Id49fe842c3b086fbe6a853a58cc801942439e88d
diff --git a/support/Android.mk b/support/Android.mk
index 1860584..5a75dd4 100644
--- a/support/Android.mk
+++ b/support/Android.mk
@@ -24,6 +24,6 @@
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := KeyChainTestsSupport
-LOCAL_STATIC_JAVA_LIBRARIES := com.android.keychain.tests.support
+LOCAL_STATIC_JAVA_LIBRARIES := com.android.keychain.tests.support junit
LOCAL_CERTIFICATE := platform
include $(BUILD_PACKAGE)
diff --git a/tests/Android.mk b/tests/Android.mk
index 8084faf..d4528a9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,5 +18,9 @@
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := KeyChainTests
-LOCAL_STATIC_JAVA_LIBRARIES := com.android.keychain.tests.support core-tests-support mockwebserver
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ com.android.keychain.tests.support \
+ core-tests-support \
+ mockwebserver \
+ junit
include $(BUILD_PACKAGE)
