From e98e557469c72463f91cdda5ced4fef3e062f739 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 1 Mar 2017 13:21:11 +0000 Subject: [PATCH] Prepare for removal of junit and android.test classes from Android API (step 1) In preparation for removing junit and android.test classes from the Android API this change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Care was taken to ensure that any targets that depended, directly or indirectly, on android-support-test did not also depend on junit or hamcrest as they conflict with the versions embedded within android-support-test. Bug: 30188076 Test: make checkbuild Change-Id: Ic5b5b771dbc3cb5a1902cf5eb4e838a2f22c8f87 --- tests/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Android.mk b/tests/Android.mk index 3bfdb9a..a8c13cd 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -30,7 +30,8 @@ LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform LOCAL_STATIC_JAVA_LIBRARIES := \ - mockito-target + mockito-target \ + legacy-android-test include $(BUILD_PACKAGE)