PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid JUnit4 collision in android-support-test, mockito-target

Browse Source 
Bug: 31072145
Test: make droid checkbuild

Change-Id: I7f2b13a4c28e51d76313ee3b6d13c904c2925228
This commit is contained in:
Guang Zhu
2016-08-24 10:49:23 -07:00
parent 5f288793fa
commit 2705ae35f9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/Android.mk
View File

@@ -9,7 +9,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \ android-support-test \
mockito-target \ mockito-target-minus-junit4 \
espresso-core espresso-core
# Include all test java files. # Include all test java files.

2
tests/unit/Android.mk
View File

@@ -9,7 +9,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \ android-support-test \
mockito-target \ mockito-target-minus-junit4 \
espresso-core espresso-core
# Include all test java files. # Include all test java files.