From b67ddbbd25a5ab3453dc8c7cf19d3b502ab26442 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 17 Jan 2017 14:49:42 +0000 Subject: [PATCH] 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 Merged-In: I5d2c0685b74ea5ba368c777d9646b9d3ac24dca9 Change-Id: I980111b4b83d16ccd9d3a277ab2587bf638a2c8a --- tests/app/Android.mk | 3 ++- tests/unit/Android.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/app/Android.mk b/tests/app/Android.mk index 979c27d93a5..381006ab606 100644 --- a/tests/app/Android.mk +++ b/tests/app/Android.mk @@ -13,7 +13,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ espresso-core \ espresso-contrib-nodep \ espresso-intents-nodep \ - ub-uiautomator + ub-uiautomator \ + legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk index 5b20173bbbc..b8f4523364b 100644 --- a/tests/unit/Android.mk +++ b/tests/unit/Android.mk @@ -10,7 +10,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ mockito-target \ - espresso-core + espresso-core \ + legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src)