drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Testables lib should not statically link mockito

Browse Source 
- All users of the lib already statically link mockito
- We should allow the users to decide what flavor they use

Test: m -j checkbuild
Change-Id: Ibbdb8be8022432a13b872865ade47b92b28976c6
This commit is contained in:
Philip P. Moltmann
2017-12-20 15:32:16 -08:00
parent 6b93e3931e
commit dadf78987a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/testables/Android.mk
View File

@ -24,10 +24,9 @@ LOCAL_MODULE_TAG := tests
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
mockito-target-minus-junit4
android-support-test
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.mock
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.mock mockito-target-minus-junit4
include $(BUILD_STATIC_JAVA_LIBRARY)