aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-07 13:22:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-07 13:22:59 +0000
commit74ed1b6e8f188d76e3fdad5f2c4fe04f1a755790 (patch)
tree58d51b0ae149601a4fc42596b3b5524f20de768f
parent0034a66cd5bc397dff8bbc356fb0b3e1e8affcb3 (diff)
parentad800d890fccd3d9899e9bc06a8af28b4d37aff4 (diff)
downloadplatform_external_junit-params-74ed1b6e8f188d76e3fdad5f2c4fe04f1a755790.tar.gz
platform_external_junit-params-74ed1b6e8f188d76e3fdad5f2c4fe04f1a755790.tar.bz2
platform_external_junit-params-74ed1b6e8f188d76e3fdad5f2c4fe04f1a755790.zip
Replace junit-targetdex with junit am: 2eb7ea4dd4 am: b35ab41812 am: f330f31974
am: ad800d890f Change-Id: Id6c2a2d5283a76f86abae303f13643213fb5f8f2
-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