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

Commit 9addc597 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Don't include mockito in frameworks-base-testutils 

So that each test can pick if they want mockito-inline or not.

Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
parent beef470b

core/tests/packagemanagertests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ LOCAL_SRC_FILES := \ 


LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    frameworks-base-testutils

    frameworks-base-testutils \

    mockito-target-minus-junit4



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_PACKAGE_NAME := FrameworksCorePackageManagerTests

tests/utils/testutils/Android.mk

+6 −3
Original line number Diff line number Diff line
@@ -24,9 +24,12 @@ LOCAL_MODULE_TAG := tests 
LOCAL_SRC_FILES := $(call all-java-files-under,java)



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    mockito-target-minus-junit4

    android-support-test



LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock

LOCAL_JAVA_LIBRARIES := \

    android.test.runner \

    android.test.base \

    android.test.mock \

    mockito-target-minus-junit4 \



include $(BUILD_STATIC_JAVA_LIBRARY)