diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:10 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-10 09:42:29 +0100 |
| commit | fa6f8a76fb582d1629845e0e23d44fc60fedcb2d (patch) | |
| tree | a582c5d980c5e32a2cba28715bf41634a0a96e39 /cmds/uiautomator | |
| parent | 168bffa03982e01d8c8f68026f4f89acb2f718ff (diff) | |
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
(cherry picked from commit 00229bc6cfd74c3221d02af6df07960a0f36af1a)
Change-Id: I7fea20f92a5a92885733bc6ecb83b7276a48fbc2
Merged-In: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
Diffstat (limited to 'cmds/uiautomator')
| -rw-r--r-- | cmds/uiautomator/instrumentation/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/uiautomator/instrumentation/Android.mk b/cmds/uiautomator/instrumentation/Android.mk index 0c93b4c7b970..e6cbdb4ec49b 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 |