Merge "Use Extended Mockito in the frameworks/base unit tests." into main (bcf5fa84) · Commits · e / os / android_frameworks_base

wifi/tests/Android.bp

+7 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ android_test {
		"androidx.test.core",
		"frameworks-base-testutils",
		"guava",
		"mockito-target-minus-junit4",
		"mockito-target-extended-minus-junit4",
		"truth",
		],

		@@ -48,6 +48,12 @@ android_test {
		"android.test.base",
		],

		// Required by Extended Mockito
		jni_libs: [
		"libdexmakerjvmtiagent",
		"libstaticjvmtiagent",
		],

		test_suites: [
		"general-tests",
		],

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="android.net.wifi.nonupdatable.test">

		<application>
		<application android:debuggable="true">
		<uses-library android:name="android.test.runner"/>
		<activity android:label="WifiTestDummyLabel"
		android:name="WifiTestDummyName"