Merge "move backstage_power_flags_lib to framework flag list" into main (7b053c45) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+18 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ aconfig_declarations_group {
		"android.view.inputmethod.flags-aconfig-java",
		"android.webkit.flags-aconfig-java",
		"android.widget.flags-aconfig-java",
		"backstage_power_flags_lib",
		"backup_flags_lib",
		"camera_platform_flags_core_java_lib",
		"com.android.hardware.input-aconfig-java",
		@@ -1333,3 +1334,20 @@ java_aconfig_library {
		aconfig_declarations: "android.systemserver.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// backstage power
		aconfig_declarations {
		name: "backstage_power_flags",
		package: "com.android.server.power.optimization",
		container: "system",
		exportable: true,
		srcs: [
		"services/core/java/com/android/server/power/stats/flags.aconfig",
		],
		}

		java_aconfig_library {
		name: "backstage_power_flags_lib",
		aconfig_declarations: "backstage_power_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -243,7 +243,6 @@ java_library_static {
		"com.android.sysprop.watchdog",
		"securebox",
		"apache-commons-math",
		"backstage_power_flags_lib",
		"notification_flags_lib",
		"power_hint_flags_lib",
		"biometrics_flags_lib",

deleted100644 → 0

+0 −14

Original line number	Diff line number	Diff line
		aconfig_declarations {
		name: "backstage_power_flags",
		package: "com.android.server.power.optimization",
		container: "system",
		srcs: [
		"stats/*.aconfig",
		],
		}

		java_aconfig_library {
		name: "backstage_power_flags_lib",
		aconfig_declarations: "backstage_power_flags",
		sdk_version: "system_current",
		}