diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:10 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-08 19:33:27 +0100 |
| commit | 702d506d5788e39e83cc7ba6495f0d5410b46e7a (patch) | |
| tree | efa1ca0be77119c15076d0b15729ea349102f806 /cmds/uiautomator | |
| parent | d308803b82f5317eebafdf3a97baff3bcd460e60 (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
Change-Id: Ice80a29b420061f5d0af6eb46426455abf890e5e
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 |