Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58dd6c37 authored by Bernardo Rufino's avatar Bernardo Rufino
Browse files

Adjust services robotest makefile 

In preparation for transport-related tests needed to make those fixes so
that Mockito annotations would work.

1. Switched from mockito-target-minus-junit4 to
mockito-robolectric-prebuilt. Otherwise we would get dexcache == null
error (similar to
https://groups.google.com/a/google.com/forum/#!topic/robolectric-users/gV0_59Kj2ME/discussion)

2. Removed unused frameworks-base-testutils because it included the
ill-suited mockito dependency (as per 1).

3. Tidied up by moving test dependencies to actual test target.

Test: make RunFrameworksServicesRoboTests
Change-Id: Idd4f13a9aa0327d74b58361ad02aa3313d30ac99
parent b54be8de

services/robotests/Android.mk

+4 −6
Original line number Original line Diff line number Diff line
@@ -26,13 +26,8 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRIVILEGED_MODULE := true





LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := \

    frameworks-base-testutils \

    services.backup \

    services.backup \

    services.core \

    services.core

    android-support-test \

    mockito-target-minus-junit4 \

    platform-test-annotations \

    truth-prebuilt





include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)
@@ -45,6 +40,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 




# Include the testing libraries (JUnit4 + Robolectric libs).

# Include the testing libraries (JUnit4 + Robolectric libs).

LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    mockito-robolectric-prebuilt \

    platform-test-annotations \

    truth-prebuilt

    truth-prebuilt





LOCAL_JAVA_LIBRARIES := \

LOCAL_JAVA_LIBRARIES := \