diff options
| author | Guang Zhu <guangzhu@google.com> | 2016-08-24 10:49:24 -0700 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2016-08-25 19:43:20 +0000 |
| commit | 405796766a63c700aeb9bc1413b74c4b7f70963e (patch) | |
| tree | 28f6f2d6ca3407615db50a91a98dd4b622a1dc60 | |
| parent | e0607665e353d91d7ce5069acd1baab222fadbdd (diff) | |
| download | BlockedNumberProvider-405796766a63c700aeb9bc1413b74c4b7f70963e.tar.gz | |
Avoid JUnit4 collision in android-support-test, mockito-target
Bug: 31072145
Test: make droid checkbuild
Change-Id: I3fa71d30b139461e36bec746fdac8eee048273be
| -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 8f500de..2c81c5d 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - mockito-target \ + mockito-target-minus-junit4 \ android-support-test LOCAL_JAVA_LIBRARIES := android.test.runner |