From 03e6972b90ba3f6ed0e94a09c02d52c3d6f48a97 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 3 May 2017 11:45:35 +0100 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: I108a16e1826f3124dce00b384f9cb34d401d9bb4 --- tests/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Android.mk b/tests/Android.mk index 61ee220e82..c91e793fc3 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -17,7 +17,10 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-test \ + ub-uiautomator \ + legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src)