diff options
| author | Narayan Kamath <narayan@google.com> | 2016-02-16 11:46:55 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2016-07-11 14:52:52 +0100 |
| commit | 8cbd3b198dd624461a3b1e3e08c6d9d5e620fedf (patch) | |
| tree | a3078a9a2ce95ff3d7d805ad093a4dc015cccee6 | |
| parent | 2cb1a9ea0ef2168dbc26b67544cf7828a1076039 (diff) | |
| download | cts-8cbd3b198dd624461a3b1e3e08c6d9d5e620fedf.tar.gz | |
Use mockito-target-minus-junit4.
mockito-api isn't sufficient for tests that actually use mockito.
bug: 26458139
bug: 29411540
(cherry picked from commit 16ce308a1f34e4071f76a395ad105597209f56e8)
Change-Id: If7d511fd6bfbc51a6f1928b04b269a36151b3fb9
| -rw-r--r-- | tests/core/libcore/libcore/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/core/libcore/libcore/Android.mk b/tests/core/libcore/libcore/Android.mk index ec6228bfcbb..c9aea5e616b 100644 --- a/tests/core/libcore/libcore/Android.mk +++ b/tests/core/libcore/libcore/Android.mk @@ -16,6 +16,9 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.libcore -LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-api +# Note that we're not pulling in junit4 here because it's provided by +# android.test.runner (which might pull in a different version from the +# one that would be pulled in here). +LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-target-minus-junit4 LOCAL_JAVA_LANGUAGE_VERSION := 1.8 include $(BUILD_CTSCORE_PACKAGE) |