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

Merge "Migrate frameworks/base/packages/CarrierDefaultApp/tests/unit to androidx.test"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-11 02:21:45 +00:00
committed by Android (Google) Code Review
parent 59bb47934c 79f430e24f
commit f9de223000
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CarrierDefaultApp/tests/unit/Android.mk
View File

@@ -21,7 +21,7 @@ LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.test.base
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4
LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules mockito-target-minus-junit4
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)

2
packages/CarrierDefaultApp/tests/unit/AndroidManifest.xml
View File

@@ -21,7 +21,7 @@
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.carrierdefaultapp"
android:label="CarrierDefaultApp Unit Test Cases">
</instrumentation>