From 3a87d4fea4976e369d423ee6b080160b5d50cddf Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 1 Mar 2017 13:21:09 +0000 Subject: 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: I03f7836a1081acda5ed2c6e43cb24e9dc23b944c --- samples/ApiDemos/tests/Android.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'samples/ApiDemos') diff --git a/samples/ApiDemos/tests/Android.mk b/samples/ApiDemos/tests/Android.mk index f975662dc..ed661a002 100644 --- a/samples/ApiDemos/tests/Android.mk +++ b/samples/ApiDemos/tests/Android.mk @@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit + # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) -- cgit v1.2.3