aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-11-29 11:27:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-29 11:27:18 +0000
commit69bea890db222890b7db91e00cccaa8d3bc1e68b (patch)
tree7b0973ad91143191db019e291a5b802f79aeb88d
parentaec65ab881119fac0392777f09d90c40605ac9e9 (diff)
parentad68c20b0b8a29e42b0c09bb35d6c06d6c78a9b6 (diff)
downloadtestng-69bea890db222890b7db91e00cccaa8d3bc1e68b.tar.gz
Remove use of junit4-target when used with junit-targetdex am: e20202f9c9 am: 05053b0bd3 am: 3c5ed5c5bd
am: ad68c20b0b Change-Id: Ic601d7882c6a504077e0a4f0cb613cc97c6c4965
-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)