From 56ff021d505d57174c56c731cfececb1f5fe6e8e Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Wed, 20 Dec 2017 15:41:32 -0800 Subject: [PATCH] Testables lib should not statically link mockito - All users of the lib already statically link mockito - We should allow the users to decide what flavor they use Test: m -j checkbuild Change-Id: Ibbdb8be8022432a13b872865ade47b92b28976c6 Merged-In: Ibbdb8be8022432a13b872865ade47b92b28976c6 --- tests/testables/Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/testables/Android.mk b/tests/testables/Android.mk index 0e36981e37166..a58ce784e916d 100644 --- a/tests/testables/Android.mk +++ b/tests/testables/Android.mk @@ -25,10 +25,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - mockito-target-minus-junit4 \ legacy-android-test -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner mockito-target-minus-junit4 include $(BUILD_STATIC_JAVA_LIBRARY)