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

Merge "Adjust to new androidx.test beta02 rules."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-23 12:53:03 +00:00
committed by Android (Google) Code Review
parent ef5741f976 91ba65df14
commit ff064b1eec
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/tests/mockingservicestests/Android.mk
View File

@@ -23,7 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
frameworks-base-testutils \
services.core \
services.net \
androidx-test \
androidx.test.runner \
mockito-target-extended-minus-junit4 \
platform-test-annotations \
ShortcutManagerTestUtils \

3
services/tests/servicestests/Android.mk
View File

@@ -24,7 +24,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
services.net \
services.usage \
guava \
androidx-test \
androidx.test.runner \
androidx.test.rules \
mockito-target-minus-junit4 \
platform-test-annotations \
ShortcutManagerTestUtils \

2
services/tests/servicestests/test-apps/SuspendTestApp/Android.mk
View File

@@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_STATIC_JAVA_LIBRARIES := androidx-test ub-uiautomator
LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.runner ub-uiautomator
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_SRC_FILES += ../../src/com/android/server/pm/SuspendPackagesTest.java

2
services/tests/wmtests/Android.mk
View File

@@ -14,7 +14,7 @@ LOCAL_SRC_FILES := \
$(call all-java-files-under, ../servicestests/utils)
LOCAL_STATIC_JAVA_LIBRARIES := \
androidx-test \
androidx.test.runner \
mockito-target-minus-junit4 \
platform-test-annotations \