From 3da8b565a87de7d33569dda01ce7ac33a53368e0 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 17 Jan 2017 15:41:06 +0000 Subject: 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 Change-Id: I8b29b7d78c97c648d3c98067ac7b050b0a106369 --- tests/Android.mk | 6 +++++- tests/permission/Android.mk | 1 + tests/public_api_access/Android.mk | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Android.mk b/tests/Android.mk index 655ec168..dc3cbbad 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -8,7 +8,11 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_INSTRUMENTATION_FOR := DownloadProvider LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := mockwebserver dexmaker mockito-target +LOCAL_STATIC_JAVA_LIBRARIES := \ + mockwebserver \ + dexmaker \ + mockito-target \ + legacy-android-test LOCAL_PACKAGE_NAME := DownloadProviderTests LOCAL_CERTIFICATE := media diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk index 41ceabc2..62f4d024 100644 --- a/tests/permission/Android.mk +++ b/tests/permission/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := DownloadProviderPermissionTests include $(BUILD_PACKAGE) diff --git a/tests/public_api_access/Android.mk b/tests/public_api_access/Android.mk index 6c6db1f4..66f2f101 100644 --- a/tests/public_api_access/Android.mk +++ b/tests/public_api_access/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := DownloadPublicApiAccessTests include $(BUILD_PACKAGE) -- cgit v1.2.3