aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-07 13:15:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-07 13:15:01 +0000
commitad800d890fccd3d9899e9bc06a8af28b4d37aff4 (patch)
tree58d51b0ae149601a4fc42596b3b5524f20de768f
parentb03c543b239b79e30c29ad1b197c757c31910564 (diff)
parentf330f31974008b65c6bb50c4c1d13587d2bb4fa9 (diff)
downloadjunit-params-ad800d890fccd3d9899e9bc06a8af28b4d37aff4.tar.gz
Replace junit-targetdex with junit am: 2eb7ea4dd4 am: b35ab41812
am: f330f31974 Change-Id: Iebda00eb11345447aab8bdec38a6df69d0564bdd
-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