From 702d506d5788e39e83cc7ba6495f0d5410b46e7a Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 1 Mar 2017 13:21:10 +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: Ice80a29b420061f5d0af6eb46426455abf890e5e Merged-In: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749 --- cmds/uiautomator/instrumentation/Android.mk | 1 + .../tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.mk | 2 ++ core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk | 2 ++ core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk | 2 ++ .../tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk | 2 ++ core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk | 2 ++ services/tests/shortcutmanagerutils/Android.mk | 3 ++- tests/SurfaceComposition/Android.mk | 2 ++ tests/WindowAnimationJank/Android.mk | 6 +++++- 9 files changed, 20 insertions(+), 2 deletions(-) diff --git a/cmds/uiautomator/instrumentation/Android.mk b/cmds/uiautomator/instrumentation/Android.mk index 0c93b4c7b970..e6cbdb4ec49b 100644 --- a/cmds/uiautomator/instrumentation/Android.mk +++ b/cmds/uiautomator/instrumentation/Android.mk @@ -22,6 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \ $(call all-java-files-under, ../library/core-src) LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit LOCAL_MODULE := uiautomator-instrumentation # TODO: change this to 18 when it's available LOCAL_SDK_VERSION := current diff --git a/core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.mk b/core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.mk index c70c1d3c64ea..5a545e59e0b9 100644 --- a/core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.mk @@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current +LOCAL_STATIC_JAVA_LIBRARIES := junit + LOCAL_PACKAGE_NAME := ExternalLocAllPermsTestApp include $(BUILD_PACKAGE) diff --git a/core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk b/core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk index 7946e1aed402..b35cbae58621 100644 --- a/core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk @@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit + LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := ExternalSharedPermsTestApp diff --git a/core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk b/core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk index 657d0a4074d8..06812b511686 100644 --- a/core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk @@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit + LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := ExternalSharedPermsBTTestApp diff --git a/core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk b/core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk index d4450dc8e4b8..48bceafac26b 100644 --- a/core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk @@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit + LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := ExternalSharedPermsDiffKeyTestApp diff --git a/core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk b/core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk index 81548624efc2..569d102358da 100644 --- a/core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk @@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit + LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := ExternalSharedPermsFLTestApp diff --git a/services/tests/shortcutmanagerutils/Android.mk b/services/tests/shortcutmanagerutils/Android.mk index 2818457c9ac9..880bff8ca70d 100644 --- a/services/tests/shortcutmanagerutils/Android.mk +++ b/services/tests/shortcutmanagerutils/Android.mk @@ -20,7 +20,8 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - mockito-target + mockito-target \ + legacy-android-test LOCAL_MODULE_TAGS := optional diff --git a/tests/SurfaceComposition/Android.mk b/tests/SurfaceComposition/Android.mk index 95f69f179c20..d97c3f4cd66f 100644 --- a/tests/SurfaceComposition/Android.mk +++ b/tests/SurfaceComposition/Android.mk @@ -27,6 +27,8 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit + LOCAL_PACKAGE_NAME := SurfaceComposition LOCAL_SDK_VERSION := current diff --git a/tests/WindowAnimationJank/Android.mk b/tests/WindowAnimationJank/Android.mk index 888ae6434516..f356afb799a2 100644 --- a/tests/WindowAnimationJank/Android.mk +++ b/tests/WindowAnimationJank/Android.mk @@ -24,7 +24,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := WindowAnimationJank -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator ub-janktesthelper +LOCAL_STATIC_JAVA_LIBRARIES := \ + ub-uiautomator \ + ub-janktesthelper \ + legacy-android-test \ + junit LOCAL_SDK_VERSION := current -- 2.11.0