Merge "Update trunk stable flags for autofill" into main (088cb229) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+17 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ aconfig_srcjars = [
		":android.credentials.flags-aconfig-java{.generated_srcjars}",
		":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",
		":android.service.voice.flags-aconfig-java{.generated_srcjars}",
		":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
		]

		filegroup {
		@@ -416,3 +417,19 @@ java_aconfig_library {
		aconfig_declarations: "android.service.voice.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Autofill
		aconfig_declarations {
		name: "android.service.autofill.flags-aconfig",
		package: "android.service.autofill",
		srcs: [
		"services/autofill/bugfixes.aconfig",
		"services/autofill/features.aconfig"
		],
		}

		java_aconfig_library {
		name: "android.service.autofill.flags-aconfig-java",
		aconfig_declarations: "android.service.autofill.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

+1 −15

Original line number	Diff line number	Diff line
		@@ -19,19 +19,5 @@ java_library_static {
		defaults: ["platform_service_defaults"],
		srcs: [":services.autofill-sources"],
		libs: ["services.core"],
		static_libs: ["autofill_flags_java_lib"],
		}

		aconfig_declarations {
		name: "autofill_flags",
		package: "android.service.autofill",
		srcs: [
		"bugfixes.aconfig",
		"features.aconfig",
		],
		}

		java_aconfig_library {
		name: "autofill_flags_java_lib",
		aconfig_declarations: "autofill_flags",
		static_libs: ["android.service.autofill.flags-aconfig-java"],
		}