commit f2be0b528823b9e79265cb0110f964fb269c5247
author Paul Duffin <paulduffin@google.com> Wed Dec 07 13:15:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 07 13:15:11 2016 +0000
tree 326a29c4461b2cf297f47772bb6577012544cba3
parent dafb52c43960dc9d0284e1202f9dcbbe3921cb78
parent 1ff506629c4a3847f44b4b1d65f78a66bed9c8c7

Replace junit-targetdex with junit am: 1f7c52f3dd am: 178cf625cc
am: 1ff506629c

Change-Id: I7e92f0e3c8476dde02f530414223d1736fdc498d

Android.mk

diff --git a/Android.mk b/Android.mk
index b4cd5a5..8acd934 100644
--- a/Android.mk
+++ b/Android.mk
@@ -61,7 +61,7 @@
 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 @@
 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)