From 00229bc6cfd74c3221d02af6df07960a0f36af1a 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: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749 --- cmds/uiautomator/instrumentation/Android.mk | 1 + .../test-apps/ExternalLocAllPermsTestApp/Android.mk | 2 ++ .../hosttests/test-apps/ExternalSharedPerms/Android.mk | 2 ++ .../hosttests/test-apps/ExternalSharedPermsBT/Android.mk | 2 ++ .../test-apps/ExternalSharedPermsDiffKey/Android.mk | 2 ++ .../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 0c93b4c7b970a..e6cbdb4ec49b5 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 c70c1d3c64eae..5a545e59e0b94 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 7946e1aed4024..b35cbae58621d 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 657d0a4074d88..06812b511686b 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 d4450dc8e4b8b..48bceafac26b1 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 81548624efc2c..569d102358dad 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 dc97599c519e3..c7657f65a2b40 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_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 95f69f179c202..d97c3f4cd66f7 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 888ae64345163..f356afb799a28 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