summaryrefslogtreecommitdiff
path: root/cmds/uiautomator
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-12-15 07:22:37 +0000
committerPaul Duffin <paulduffin@google.com>2017-12-15 07:37:51 +0000
commite451de10d666d4422d27f3c26ec30aee5bf6e0d9 (patch)
tree16c7dbe80557b7b23e241fd7ce3306f559b6d485 /cmds/uiautomator
parent1895f2e5bb3c07b2dc85ed6267848e820d6c39b0 (diff)
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
Diffstat (limited to 'cmds/uiautomator')
-rw-r--r--cmds/uiautomator/instrumentation/Android.mk2
1 files changed, 1 insertions, 1 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