diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-03-16 18:22:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-16 18:22:25 +0000 |
| commit | b0bee7ff83ef086473f0e339c6d25b47bcc76503 (patch) | |
| tree | 0d121f036a2ef0ecac498d67c65aea23deb0f83f | |
| parent | 2ec0ef53c0f54d6d5b92d2bd88254f51e3b89369 (diff) | |
| parent | 7eb0e101be3e9b4e4693927a206b3ee1ed502c68 (diff) | |
| download | mockito-b0bee7ff83ef086473f0e339c6d25b47bcc76503.tar.gz | |
Merge "Break dependency between dexmaker-mockmaker-updated and dexmaker"
| -rw-r--r-- | mockito-updated/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mockito-updated/Android.mk b/mockito-updated/Android.mk index dc35689..5265178 100644 --- a/mockito-updated/Android.mk +++ b/mockito-updated/Android.mk @@ -70,7 +70,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # using mockito is run using android.test.runner. include $(CLEAR_VARS) LOCAL_MODULE := mockito-updated-target-minus-junit4 -LOCAL_STATIC_JAVA_LIBRARIES := mockito-updated-api dexmaker dexmaker-mockmaker-updated objenesis-target +LOCAL_STATIC_JAVA_LIBRARIES := mockito-updated-api dexmaker-mockmaker-updated objenesis-target LOCAL_JAVA_LIBRARIES := junit LOCAL_SDK_VERSION := 16 LOCAL_MODULE_TAGS := optional |