Merge "Replace junit4-target with junit"
diff --git a/Android.mk b/Android.mk
index a3b32f5..ffacf71 100644
--- a/Android.mk
+++ b/Android.mk
@@ -66,7 +66,7 @@
$(filter-out $(explicit_target_excludes), $(target_src_files))
LOCAL_SRC_FILES := $(target_src_files)
-LOCAL_JAVA_LIBRARIES := junit4-target objenesis-target
+LOCAL_JAVA_LIBRARIES := junit objenesis-target
LOCAL_MODULE := mockito-api
LOCAL_SDK_VERSION := 16
LOCAL_MODULE_TAGS := optional
@@ -77,18 +77,18 @@
include $(CLEAR_VARS)
LOCAL_MODULE := mockito-target
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target-minus-junit4 junit4-target
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target-minus-junit4 junit
LOCAL_SDK_VERSION := 16
LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_JAVA_LIBRARY)
-# A mockito target that doesn't pull in junit4-target. This is used to work around
-# issues caused by multiple copies of junit4 in the classpath, usually when a test
+# A mockito target that doesn't pull in junit. This is used to work around
+# issues caused by multiple copies of junit in the classpath, usually when a test
# using mockito is run using android.test.runner.
include $(CLEAR_VARS)
LOCAL_MODULE := mockito-target-minus-junit4
LOCAL_STATIC_JAVA_LIBRARIES := mockito-api dexmaker dexmaker-mockmaker objenesis-target
-LOCAL_JAVA_LIBRARIES := junit4-target
+LOCAL_JAVA_LIBRARIES := junit
LOCAL_SDK_VERSION := 16
LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
