Move Mockito to static library section of core-tests
Also removes junit because it's depended on by Mockito.
Test: cts -m CtsLibcoreTestCases
Change-Id: Id60d8f6ee09756a3e4018561a083d2e91c966015
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index b033959..7c65d75 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -229,11 +229,12 @@
# be loaded by tests using ClassLoaders but are not in the main classes.dex.
LOCAL_JAVA_RESOURCE_FILES := $(TARGET_OUT)/framework/filesystemstest.jar
LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-oj core-libart okhttp junit bouncycastle mockito-target
+LOCAL_JAVA_LIBRARIES := core-oj core-libart okhttp bouncycastle
LOCAL_STATIC_JAVA_LIBRARIES := \
core-test-rules \
core-tests-support \
mockftpserver \
+ mockito-target \
mockwebserver \
nist-pkix-tests \
slf4j-jdk14 \