From e20202f9c99c5b8f9f4ebdaa91f751d66f974f86 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 28 Nov 2016 14:50:09 +0000 Subject: 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 --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 19a18b80..c2049246 100644 --- a/Android.mk +++ b/Android.mk @@ -61,7 +61,7 @@ include $(CLEAR_VARS) 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 @@ include $(CLEAR_VARS) 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) -- cgit v1.2.3