Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Testables lib should not statically link mockito"

Browse Source 
am: 47d04fc5c0

Change-Id: I4aee182a94fa62a8a254f0bbc480b4de1a4ed688
This commit is contained in:
Philip P. Moltmann
2017-12-21 19:12:57 +00:00
committed by android-build-merger
parent 151c15445a 47d04fc5c0
commit b42cd23425
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/testables/Android.mk
View File

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