commit 8bf406acc077d5f27bd9b1d4d9525ca70db5cb0f
author Kenny Root <kroot@google.com> Wed Aug 10 16:18:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 10 16:18:18 2016 +0000
tree 3fcdbe980532c6abdbb7097820fbe73a2f9d6ef6
parent c9ba18ba8eb8181cc251691ebf16d9396b72010e
parent d81d51ac046e2378bfe947aef46497b69e32f890

Merge "Add Mockito to deps for Conscrypt tests and remove core-tests"
am: d81d51ac04

Change-Id: I6e033f57aea2d5aaa703db674e0b3561ab0f351c

tests/core/libcore/conscrypt/Android.mk

diff --git a/tests/core/libcore/conscrypt/Android.mk b/tests/core/libcore/conscrypt/Android.mk
index cd8559c..55beb9d 100644
--- a/tests/core/libcore/conscrypt/Android.mk
+++ b/tests/core/libcore/conscrypt/Android.mk
@@ -20,6 +20,6 @@
 
 include $(CLEAR_VARS)
 LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.conscrypt
-LOCAL_STATIC_JAVA_LIBRARIES := core-tests conscrypt-tests
+LOCAL_STATIC_JAVA_LIBRARIES := conscrypt-tests mockito-target-minus-junit4
 LOCAL_JAVA_LANGUAGE_VERSION := 1.8
 include $(BUILD_CTSCORE_PACKAGE)