aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-07 12:59:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-07 12:59:33 +0000
commitb35ab4181299c416d1d112acba070cb1dfb9724c (patch)
tree58d51b0ae149601a4fc42596b3b5524f20de768f
parente9e6cb4a30d50e57d24ac83536d26b28bc53d546 (diff)
parent2eb7ea4dd496b1a4f0d2917092faec2c53df76ba (diff)
downloadplatform_external_junit-params-b35ab4181299c416d1d112acba070cb1dfb9724c.tar.gz
platform_external_junit-params-b35ab4181299c416d1d112acba070cb1dfb9724c.tar.bz2
platform_external_junit-params-b35ab4181299c416d1d112acba070cb1dfb9724c.zip
Replace junit-targetdex with junit
am: 2eb7ea4dd4 Change-Id: Ie8c8721248fa803e6baaae77823e233c16a642ed
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 549592e..57b1ac7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,7 +50,7 @@ LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := core-oj core-libart
LOCAL_STATIC_JAVA_LIBRARIES := \
- junit4-target
+ junit
include $(BUILD_STATIC_JAVA_LIBRARY)
#-------------------------------
@@ -68,7 +68,7 @@ LOCAL_JAVA_RESOURCE_DIRS := src/test/resources
LOCAL_MODULE := junit-params-test
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := core-oj core-libart junit-targetdex
+LOCAL_JAVA_LIBRARIES := core-oj core-libart junit
LOCAL_STATIC_JAVA_LIBRARIES := \
junit-params \
junit-params-assertj-core