From e451de10d666d4422d27f3c26ec30aee5bf6e0d9 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 15 Dec 2017 07:22:37 +0000 Subject: [PATCH] Add android.test.base/stubs dependency In preparation for the removal of the non-junit classes in the android.test.base library from the android.jar this adds a dependency on android.test.base/stubs to ensure this code will continue to compile. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * cmds/uiautomator/instrumentation/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because uiautomator-instrumentation's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because ExternalSharedPermsTestApp's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because ExternalSharedPermsBTTestApp's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because ExternalSharedPermsDiffKeyTestApp's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because ExternalSharedPermsFLTestApp's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * nfc-extras/tests/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because NfcExtrasTests's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * tests/SurfaceComposition/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because SurfaceComposition's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * tests/WindowAnimationJank/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because WindowAnimationJank's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. Bug: 30188076 Test: make dist Change-Id: I92b3ff3e5fede3d8d8ecefb0b2e1ee93c5ca9875 --- cmds/uiautomator/instrumentation/Android.mk | 2 +- core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk | 2 ++ .../tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk | 2 ++ .../hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk | 2 ++ .../tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk | 2 ++ nfc-extras/tests/Android.mk | 3 ++- tests/SurfaceComposition/Android.mk | 2 +- tests/WindowAnimationJank/Android.mk | 2 ++ 8 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cmds/uiautomator/instrumentation/Android.mk b/cmds/uiautomator/instrumentation/Android.mk index 008bb935cb717..ed99f3e149224 100644 --- a/cmds/uiautomator/instrumentation/Android.mk +++ b/cmds/uiautomator/instrumentation/Android.mk @@ -21,7 +21,7 @@ include $(CLEAR_VARS) 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_JAVA_LIBRARIES := android.test.runner android.test.base.stubs LOCAL_STATIC_JAVA_LIBRARIES := junit LOCAL_MODULE := uiautomator-instrumentation # TODO: change this to 18 when it's available diff --git a/core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk b/core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk index 193e6010cef3a..b255c7e4063a1 100644 --- a/core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk @@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := junit +LOCAL_JAVA_LIBRARIES := android.test.base.stubs + 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 9f44767eed49b..428b1f800c2f4 100644 --- a/core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk @@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := junit +LOCAL_JAVA_LIBRARIES := android.test.base.stubs + 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 b4d354c6f359a..93ece8666cf38 100644 --- a/core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk @@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := junit +LOCAL_JAVA_LIBRARIES := android.test.base.stubs + 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 969e588719035..b34896682cc74 100644 --- a/core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk +++ b/core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk @@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := junit +LOCAL_JAVA_LIBRARIES := android.test.base.stubs + LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := ExternalSharedPermsFLTestApp diff --git a/nfc-extras/tests/Android.mk b/nfc-extras/tests/Android.mk index be2bb532b9561..34d65082d8d85 100644 --- a/nfc-extras/tests/Android.mk +++ b/nfc-extras/tests/Android.mk @@ -20,7 +20,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := \ android.test.runner \ - com.android.nfc_extras + com.android.nfc_extras \ + android.test.base.stubs LOCAL_STATIC_JAVA_LIBRARIES := junit diff --git a/tests/SurfaceComposition/Android.mk b/tests/SurfaceComposition/Android.mk index 1962791c83921..f59458d48c687 100644 --- a/tests/SurfaceComposition/Android.mk +++ b/tests/SurfaceComposition/Android.mk @@ -29,7 +29,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := junit -LOCAL_JAVA_LIBRARIES := android.test.runner.stubs +LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_PACKAGE_NAME := SurfaceComposition diff --git a/tests/WindowAnimationJank/Android.mk b/tests/WindowAnimationJank/Android.mk index 8aac8a15c705a..7800a8078d2a9 100644 --- a/tests/WindowAnimationJank/Android.mk +++ b/tests/WindowAnimationJank/Android.mk @@ -29,6 +29,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ ub-janktesthelper \ junit +LOCAL_JAVA_LIBRARIES := android.test.base.stubs + LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE)