aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-11-29 11:17:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-29 11:17:18 +0000
commit3c5ed5c5bdf384e1900a776aa98bce0099e753a6 (patch)
tree7b0973ad91143191db019e291a5b802f79aeb88d
parent332e82d5493255562930e3186fe5b2b6ee807230 (diff)
parent05053b0bd31eefef587e7c2f015a60815125899c (diff)
downloadtestng-3c5ed5c5bdf384e1900a776aa98bce0099e753a6.tar.gz
Remove use of junit4-target when used with junit-targetdex am: e20202f9c9
am: 05053b0bd3 Change-Id: I285046055b5c0a68198be449c51ffdcf0c18bca1
-rw-r--r--Android.mk4
1 files 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)