aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-07 12:59:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-07 12:59:41 +0000
commit178cf625cc5dd31aa20fc31cbd1a0af8580a34af (patch)
tree326a29c4461b2cf297f47772bb6577012544cba3
parent3e2baf2ea3dfaa9c861b603db11caab9ed511d9f (diff)
parent1f7c52f3ddcd692736f0e4d15a6a3d50a343a705 (diff)
downloadtestng-178cf625cc5dd31aa20fc31cbd1a0af8580a34af.tar.gz
Replace junit-targetdex with junit
am: 1f7c52f3dd Change-Id: Ie10f04fbf66a9c1963e733f5c1d2ef10917a41bf
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index b4cd5a52..8acd934c 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
+LOCAL_JAVA_LIBRARIES := junit
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
+LOCAL_JAVA_LIBRARIES := junit
include $(LOCAL_PATH)/GenerateTemplates.mk # Generate Version.java
include $(BUILD_JAVA_LIBRARY)