filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare for removal of junit and android.test classes from Android API (step 1)

Browse Source 
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: Ic5b5b771dbc3cb5a1902cf5eb4e838a2f22c8f87
This commit is contained in:
Paul Duffin
2017-03-01 13:21:11 +00:00
parent 991c2e5ab8
commit e98e557469
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Android.mk
+2 -1
View File
@@ -30,7 +30,8 @@ LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
mockito-target mockito-target \
legacy-android-test
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)