aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-01 13:34:21 +0000
committerPaul Duffin <paulduffin@google.com>2016-12-07 12:13:48 +0000
commit1f7c52f3ddcd692736f0e4d15a6a3d50a343a705 (patch)
tree326a29c4461b2cf297f47772bb6577012544cba3
parent3e2baf2ea3dfaa9c861b603db11caab9ed511d9f (diff)
downloadtestng-1f7c52f3ddcd692736f0e4d15a6a3d50a343a705.tar.gz
Replace junit-targetdex with junitandroid-n-mr2-preview-1
Bug: 30188076 Test: make checkbuild Change-Id: If1bdc4414ca5030373a1a4a3f9d8249c2413c6d4
-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)