Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4be0fc4 authored by Guang Zhu's avatar Guang Zhu
Browse files

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

Bug: 31072145
Test: make droid checkbuild

Change-Id: Ic56e6d4a909f729b1b19807683f5db439a5668dd
parent 42abd706

tests/telephonytests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) 


LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common ims-common services.core

LOCAL_STATIC_JAVA_LIBRARIES := guava \

                               mockito-target \

                               mockito-target-minus-junit4 \

                               android-support-test



LOCAL_PACKAGE_NAME := FrameworksTelephonyTests