Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f924642729

Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7
This commit is contained in:
Philip P. Moltmann
2017-12-20 19:09:03 +00:00
committed by android-build-merger
parent 5949912523 f924642729
commit cf7aa7c09e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/tests/packagemanagertests/Android.mk
View File

@@ -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

7
tests/utils/testutils/Android.mk
View File

@@ -25,9 +25,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java)
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
legacy-android-test \
legacy-android-test
LOCAL_JAVA_LIBRARIES := \
android.test.runner \
mockito-target-minus-junit4
LOCAL_JAVA_LIBRARIES := android.test.runner
include $(BUILD_STATIC_JAVA_LIBRARY)