diff options
| author | Guang Zhu <guangzhu@google.com> | 2016-08-24 10:49:23 -0700 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2016-08-25 05:15:26 +0000 |
| commit | d15b25ba43c296a54e6cfdaf106612349ac5a588 (patch) | |
| tree | 1977dbd66a5b76a4570f217ad6a67f26759d27e4 | |
| parent | 5b28546b267804bc60f71cea2f68428a1be9e7a9 (diff) | |
Avoid JUnit4 collision in android-support-test, mockito-target
Bug: 31072145
Test: make droid checkbuild
Change-Id: I257899fe815855d8cb9763693063b559d5038fb8
| -rw-r--r-- | tests/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 07f4f00d9..910d89376 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -17,7 +17,7 @@ src_dirs := src \ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_STATIC_JAVA_LIBRARIES += \ - mockito-target + mockito-target-minus-junit4 LOCAL_PACKAGE_NAME := DialerTests |