diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-07-12 09:41:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-12 09:41:24 +0000 |
| commit | f0f4ee250d2599515eedfe3a81d4d0892efd4f80 (patch) | |
| tree | a3078a9a2ce95ff3d7d805ad093a4dc015cccee6 | |
| parent | f2c6c851d2eb349729613906aeb96370a04fa460 (diff) | |
| parent | 8cbd3b198dd624461a3b1e3e08c6d9d5e620fedf (diff) | |
| download | cts-n-iot-preview-2.tar.gz | |
Merge changes from topic 'mockito-without-junit'android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
* changes:
Use mockito-target-minus-junit4.
android.core.tests.libcore.package.tests: add mockito to the dependencies
| -rw-r--r-- | tests/core/libcore/libcore/Android.mk | 5 | ||||
| -rw-r--r-- | tests/core/libcore/tests/Android.mk | 2 |
2 files changed, 5 insertions, 2 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) diff --git a/tests/core/libcore/tests/Android.mk b/tests/core/libcore/tests/Android.mk index e9b94226115..6429558580c 100644 --- a/tests/core/libcore/tests/Android.mk +++ b/tests/core/libcore/tests/Android.mk @@ -16,6 +16,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.tests -LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-api +LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-target-minus-junit4 LOCAL_JAVA_LANGUAGE_VERSION := 1.8 include $(BUILD_CTSCORE_PACKAGE) |