Merge "Test: Added mocking static classes support." into main (75f85b43) · Commits · e / os / android_frameworks_base

nfc/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ filegroup {
		java_sdk_library {
		name: "framework-nfc",
		libs: [
		"androidx.annotation_annotation",
		"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
		"framework-permission-s.stubs.module_lib",
		"framework-permission.stubs.module_lib",

+23 −4

Original line number	Diff line number	Diff line
		@@ -25,17 +25,36 @@ package {
		android_test {
		name: "NfcManagerTests",
		static_libs: [
		"androidx.test.ext.junit",
		"androidx.test.core",
		"androidx.test.rules",
		"mockito-target-minus-junit4",
		"androidx.test.runner",
		"androidx.test.ext.junit",
		"framework-nfc.impl",
		"mockito-target-extended-minus-junit4",
		"frameworks-base-testutils",
		"truth",
		"androidx.annotation_annotation",
		"androidx.appcompat_appcompat",
		"flag-junit",
		"platform-test-annotations",
		"testables",
		],
		libs: [
		"framework-nfc.impl",
		"android.test.base.stubs.system",
		"android.test.mock.stubs.system",
		"android.test.runner.stubs.system",
		],
		jni_libs: [
		// Required for ExtendedMockito
		"libdexmakerjvmtiagent",
		"libstaticjvmtiagent",
		],
		srcs: ["src/*/.java"],
		platform_apis: true,
		certificate: "platform",
		test_suites: ["device-tests"],
		test_suites: [
		"device-tests",
		"mts-nfc",
		],
		min_sdk_version: "35", // Should be 36 later.
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="android.nfc">

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