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
This commit is contained in:
Paul Duffin
2017-12-15 07:22:37 +00:00
parent 1895f2e5bb
commit e451de10d6
8 changed files with 14 additions and 3 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)