commit 56ff021d505d57174c56c731cfececb1f5fe6e8e
author Philip P. Moltmann <moltmann@google.com> Wed Dec 20 15:41:32 2017 -0800
committer Philip P. Moltmann <moltmann@google.com> Wed Dec 20 15:41:32 2017 -0800
tree a9a6adc0fc52c7506ecd34abbc50d4fab285b8ed
parent 0abc93177f0561ab7874531f346c5de11094f048

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

diff --git a/tests/testables/Android.mk b/tests/testables/Android.mk
index 0e36981..a58ce78 100644
--- a/tests/testables/Android.mk
+++ b/tests/testables/Android.mk
@@ -25,10 +25,9 @@
 
 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)