aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-07 13:23:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-07 13:23:09 +0000
commitd9d5b5a5130a4c9ab1b05742105c508038d7cd90 (patch)
tree326a29c4461b2cf297f47772bb6577012544cba3
parent640cef102cd0eaa911df9e17da4844de7eb3e4b7 (diff)
parentf2be0b528823b9e79265cb0110f964fb269c5247 (diff)
downloadtestng-d9d5b5a5130a4c9ab1b05742105c508038d7cd90.tar.gz
Replace junit-targetdex with junit am: 1f7c52f3dd am: 178cf625cc am: 1ff506629c
am: f2be0b5288 Change-Id: I841c2f90abc7560b99c27e8744e19a23ca054c30
-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)