diff options
| author | 2017-12-15 23:47:40 +0000 | |
|---|---|---|
| committer | 2017-12-15 23:47:40 +0000 | |
| commit | cc1b3e0e89c738503f99a4fe23de1712425c67e4 (patch) | |
| tree | 5108497edb21f746ce8c199e0bdd7afa686e73a1 | |
| parent | 41b745ca0d117c07419f9255485b8ca5094c653d (diff) | |
| parent | e451de10d666d4422d27f3c26ec30aee5bf6e0d9 (diff) | |
Merge "Add android.test.base/stubs dependency"
8 files changed, 14 insertions, 3 deletions
diff --git a/cmds/uiautomator/instrumentation/Android.mk b/cmds/uiautomator/instrumentation/Android.mk index 008bb935cb71..ed99f3e14922 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 193e6010cef3..b255c7e4063a 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 9f44767eed49..428b1f800c2f 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 b4d354c6f359..93ece8666cf3 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 969e58871903..b34896682cc7 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 be2bb532b956..34d65082d8d8 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 1962791c8392..f59458d48c68 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 8aac8a15c705..7800a8078d2a 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) |