From d8539fbb9b8cb9f02e251d3abd8901d6b85ff156 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Wed, 24 Aug 2016 10:49:24 -0700 Subject: [PATCH] Avoid JUnit4 collision in android-support-test, mockito-target Bug: 31072145 Test: make droid checkbuild Change-Id: I507b476694f88cc960804904feff330e6f9358c4 --- tests/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)