Merge "[Catalyst] Make tests depend on lib instead of srcs to access Kotlin friend" into main (36f4dc8e) · Commits · e / os / android_frameworks_base

packages/SettingsLib/DataStore/Android.bp

+1 −6

Original line number	Diff line number	Diff line
		@@ -2,18 +2,13 @@ package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		filegroup {
		name: "SettingsLibDataStore-srcs",
		srcs: ["src/*/"],
		}

		android_library {
		name: "SettingsLibDataStore",
		defaults: [
		"SettingsLintDefaults",
		],
		min_sdk_version: "21",
		srcs: [":SettingsLibDataStore-srcs"],
		srcs: ["src/*/.kt"],
		static_libs: [
		"androidx.annotation_annotation",
		"androidx.collection_collection-ktx",

+3 −4

Original line number	Diff line number	Diff line
		@@ -9,11 +9,9 @@ android_app {

		android_robolectric_test {
		name: "SettingsLibDataStoreTest",
		srcs: [
		":SettingsLibDataStore-srcs", // b/240432457
		"src/*/",
		],
		srcs: ["src/*/.kt"],
		static_libs: [
		"SettingsLibDataStore",
		"androidx.collection_collection-ktx",
		"androidx.core_core-ktx",
		"androidx.test.ext.junit",
		@@ -22,6 +20,7 @@ android_robolectric_test {
		"mockito-robolectric-prebuilt", // mockito deps order matters!
		"mockito-kotlin2",
		],
		associates: ["SettingsLibDataStore"],
		java_resource_dirs: ["config"],
		instrumentation_for: "SettingsLibDataStoreShell",
		coverage_libs: ["SettingsLibDataStore"],

+1 −6

Original line number	Diff line number	Diff line
		@@ -2,17 +2,12 @@ package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		filegroup {
		name: "SettingsLibGraph-srcs",
		srcs: ["src/*/.kt"],
		}

		android_library {
		name: "SettingsLibGraph",
		defaults: [
		"SettingsLintDefaults",
		],
		srcs: [":SettingsLibGraph-srcs"],
		srcs: ["src/*/.kt"],
		static_libs: [
		"SettingsLibGraph-proto-lite",
		"SettingsLibIpc",

+1 −6

Original line number	Diff line number	Diff line
		@@ -2,17 +2,12 @@ package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		filegroup {
		name: "SettingsLibIpc-srcs",
		srcs: ["src/*/.kt"],
		}

		android_library {
		name: "SettingsLibIpc",
		defaults: [
		"SettingsLintDefaults",
		],
		srcs: [":SettingsLibIpc-srcs"],
		srcs: ["src/*/.kt"],
		static_libs: [
		"androidx.collection_collection",
		"guava",

+1 −6

Original line number	Diff line number	Diff line
		@@ -2,18 +2,13 @@ package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		filegroup {
		name: "SettingsLibMetadata-srcs",
		srcs: ["src/*/.kt"],
		}

		android_library {
		name: "SettingsLibMetadata",
		defaults: [
		"SettingsLintDefaults",
		],
		min_sdk_version: "21",
		srcs: [":SettingsLibMetadata-srcs"],
		srcs: ["src/*/.kt"],
		static_libs: [
		"SettingsLibDataStore",
		"androidx.annotation_annotation",