Remove use of junit4-target when used with junit-targetdex
Change to external/junit means that junit-targetdex now includes
everything that is in junit4-target so it is no longer necessary
to use them both.
Bug: 30188076
Test: make checkbuild and ran cts-tradefed -m CtsLibcoreOjTestCases
Change-Id: I6f7107cf111b0b2b437d38e48ee590846e991ecf
diff --git a/Android.mk b/Android.mk
index 19a18b8..c204924 100644
--- a/Android.mk
+++ b/Android.mk
@@ -61,7 +61,7 @@
LOCAL_SRC_FILES := $(testng_src_files)
LOCAL_MODULE := testng
LOCAL_STATIC_JAVA_LIBRARIES := jcommander snakeyaml guice
-LOCAL_JAVA_LIBRARIES := junit-targetdex junit4-target
+LOCAL_JAVA_LIBRARIES := junit-targetdex
include $(LOCAL_PATH)/GenerateTemplates.mk # Generate Version.java
include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -70,7 +70,7 @@
LOCAL_SRC_FILES := $(testng_src_files)
LOCAL_MODULE := testng-lib
LOCAL_STATIC_JAVA_LIBRARIES := jcommander snakeyaml guice
-LOCAL_JAVA_LIBRARIES := junit-targetdex junit4-target
+LOCAL_JAVA_LIBRARIES := junit-targetdex
include $(LOCAL_PATH)/GenerateTemplates.mk # Generate Version.java
include $(BUILD_JAVA_LIBRARY)
