Merge "Set the container field of aconfig flags" into main (6ceaa64f) · Commits · e / os / android_packages_apps_Settings

aconfig/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ package {
		aconfig_declarations {
		name: "aconfig_settings_flags",
		package: "com.android.settings.flags",
		container: "system",
		srcs: [
		"*.aconfig",
		],
		@@ -18,6 +19,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "factory_reset_flags",
		package: "com.android.settings.factory_reset",
		container: "system",
		srcs: ["factory_reset/*.aconfig"],
		}

		@@ -29,6 +31,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "media_drm_flags",
		package: "com.android.settings.media_drm",
		container: "system",
		srcs: ["media_drm/*.aconfig"],
		}

		@@ -40,6 +43,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "accessibility_flags",
		package: "com.android.settings.accessibility",
		container: "system",
		srcs: ["accessibility/*.aconfig"],
		}

		@@ -51,8 +55,9 @@ java_aconfig_library {
		aconfig_declarations {
		name: "development_settings_flags",
		package: "com.android.settings.development",
		container: "system",
		srcs: [
		"development/*/.aconfig"
		"development/*/.aconfig",
		],
		}

+1 −0

Original line number	Diff line number	Diff line
		package: "com.android.settings.accessibility"
		container: "system"

		# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

+1 −0

Original line number	Diff line number	Diff line
		package: "com.android.settings.development"
		container: "system"

		flag {
		name: "deprecate_list_activity"

+1 −0

Original line number	Diff line number	Diff line
		package: "com.android.settings.factory_reset"
		container: "system"

		flag {
		name: "enable_factory_reset_wizard"

+1 −0

Original line number	Diff line number	Diff line
		package: "com.android.settings.media_drm"
		container: "system"

		flag {
		name: "force_l3_enabled"