diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-05-03 11:45:35 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-03 11:45:35 +0100 |
| commit | 03e6972b90ba3f6ed0e94a09c02d52c3d6f48a97 (patch) | |
| tree | acd32317792db578e2f46efbaa9b5560421b93db /tests/Android.mk | |
| parent | ad72bf8b500498e1ddb4b2754c7557d606214605 (diff) | |
| download | android_packages_apps_Trebuchet-03e6972b90ba3f6ed0e94a09c02d52c3d6f48a97.tar.gz android_packages_apps_Trebuchet-03e6972b90ba3f6ed0e94a09c02d52c3d6f48a97.tar.bz2 android_packages_apps_Trebuchet-03e6972b90ba3f6ed0e94a09c02d52c3d6f48a97.zip | |
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: I108a16e1826f3124dce00b384f9cb34d401d9bb4
Diffstat (limited to 'tests/Android.mk')
| -rw-r--r-- | tests/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 61ee220e8..c91e793fc 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -17,7 +17,10 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-test \ + ub-uiautomator \ + legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) |