summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-12-21 15:27:23 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-12-21 15:27:23 +0000
commit47d04fc5c0f49211f95cdf23c362b92efc298ecd (patch)
tree60def63ce267957019ffeecd462c5cdbf83d6687
parent3c7bc2dc06ce976e876296ed70272215b4886a95 (diff)
parent56ff021d505d57174c56c731cfececb1f5fe6e8e (diff)
Merge "Testables lib should not statically link mockito"
-rw-r--r--tests/testables/Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/testables/Android.mk b/tests/testables/Android.mk
index 0e36981e3716..a58ce784e916 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)