Merge "Make SPA tests depend on SPA lib directly" into main (36f40836) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/Android.bp

+0 −7

Original line number	Diff line number	Diff line
		@@ -45,10 +45,3 @@ android_library {
		sdk_version: "current",
		min_sdk_version: "31",
		}

		// Expose the srcs to tests, so the tests can access the internal classes.
		filegroup {
		name: "SpaLib_srcs",
		visibility: ["//frameworks/base/packages/SettingsLib/Spa/tests"],
		srcs: ["src/*/.kt"],
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,14 +23,12 @@ android_test {
		test_suites: ["device-tests"],

		srcs: [
		":SpaLib_srcs",
		"src/*/.kt",
		],
		use_resource_processor: true,
		static_libs: [
		"SpaLib",
		"SpaLibTestUtils",
		"aconfig_settingstheme_exported_flags_java_lib",
		"androidx.compose.runtime_runtime",
		"androidx.test.ext.junit",
		"androidx.test.runner",
		@@ -39,6 +37,7 @@ android_test {
		"mockito-target-minus-junit4",
		"platform-test-annotations",
		],
		associates: ["SpaLib"],
		kotlincflags: ["-Xjvm-default=all"],
		sdk_version: "current",
		min_sdk_version: "31",