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:11 +0000 |
| commit | d8539fbb9b8cb9f02e251d3abd8901d6b85ff156 (patch) | |
| tree | 9f2d868bb52a2ebba4747fec14cca85c74021cd8 /tests | |
| parent | 6b5d1cac6d4424beb4c315fd87a9be63a5a6f07c (diff) | |
| download | latinime-d8539fbb9b8cb9f02e251d3abd8901d6b85ff156.tar.gz latinime-d8539fbb9b8cb9f02e251d3abd8901d6b85ff156.tar.xz latinime-d8539fbb9b8cb9f02e251d3abd8901d6b85ff156.zip | |
Avoid JUnit4 collision in android-support-test, mockito-target
Bug: 31072145
Test: make droid checkbuild
Change-Id: I507b476694f88cc960804904feff330e6f9358c4
Diffstat (limited to 'tests')
| -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 0b5449143..ad153ae3c 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -24,7 +24,7 @@ LOCAL_AAPT_FLAGS += -0 .dict # Do not compress test data file LOCAL_AAPT_FLAGS += -0 .txt -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4 # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) |