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

Commit 30d2c140 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Don't include mockito in frameworks-base-testutils" am: f9246427 

am: cf7aa7c0

Change-Id: I6b2486c69af1a05f8282a0d648403522adf2b471
parents 53a0c205 cf7aa7c0

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

+4 −3
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java) 


LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    legacy-android-test \

    mockito-target-minus-junit4

    legacy-android-test



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_JAVA_LIBRARIES := \

    android.test.runner \

    mockito-target-minus-junit4



include $(BUILD_STATIC_JAVA_LIBRARY)