From 381c38a127bf9a491b2084f76794c9bc5ae36789 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: Icf844999082db141cffcb099aa4004afc7a7c749 Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2 --- tests/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Android.mk b/tests/Android.mk index ad153ae3c..12d9cbe96 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -24,7 +24,10 @@ LOCAL_AAPT_FLAGS += -0 .dict # Do not compress test data file LOCAL_AAPT_FLAGS += -0 .txt -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4 +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-test \ + mockito-target-minus-junit4 \ + legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src)