Merge "Add visibility for continuous_instrumentation_tests" into main (9ccc4e8e) · Commits · e / os / android_frameworks_base

packages/SettingsLib/tests/integ/Android.bp

+12 −8

Original line number	Diff line number	Diff line
		@@ -37,10 +37,10 @@ android_test {
		],

		libs: [
		"android.test.runner.stubs",
		"telephony-common",
		"android.test.base.stubs",
		"android.test.mock.stubs",
		"android.test.runner.stubs",
		"telephony-common",
		"truth",
		],

		@@ -48,20 +48,20 @@ android_test {
		test_suites: ["device-tests"],

		static_libs: [
		"SettingsLibAvatarPicker",
		"SettingsLibDeviceStateRotationLock",
		"SettingsLibSettingsSpinner",
		"SettingsLibUsageProgressBarPreference",
		"androidx.test.core",
		"androidx.test.rules",
		"androidx.test.espresso.core",
		"androidx.test.ext.junit",
		"androidx.test.rules",
		"flag-junit",
		"kotlinx_coroutines_test",
		"mockito-target-extended-minus-junit4",
		"platform-test-annotations",
		"truth",
		"SettingsLibAvatarPicker",
		"SettingsLibDeviceStateRotationLock",
		"SettingsLibSettingsSpinner",
		"SettingsLibUsageProgressBarPreference",
		"settingslib_media_flags_lib",
		"truth",
		],

		jni_libs: [
		@@ -71,6 +71,10 @@ android_test {
		],
		dxflags: ["--multi-dex"],
		manifest: "AndroidManifest.xml",

		visibility: [
		"//platform_testing:__subpackages__",
		],
		}

		test_module_config {

+6 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@ android_test {
		},

		static_libs: [
		"androidx.test.rules",
		"androidx.test.core",
		"androidx.test.rules",
		"frameworks-base-testutils",
		"guava",
		"mockito-target-extended-minus-junit4",
		@@ -44,8 +44,8 @@ android_test {
		],

		libs: [
		"android.test.runner.stubs",
		"android.test.base.stubs",
		"android.test.runner.stubs",
		],

		// Required by Extended Mockito
		@@ -57,4 +57,8 @@ android_test {
		test_suites: [
		"general-tests",
		],

		visibility: [
		"//platform_testing:__subpackages__",
		],
		}