Merge "move dropbox_flags_lib to framework flag list" into main (b17fe876) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+17 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ aconfig_declarations_group {
		"com.android.window.flags.window-aconfig-java",
		"device_policy_aconfig_flags_lib",
		"display_flags_lib",
		"dropbox_flags_lib",
		"framework-jobscheduler-job.flags-aconfig-java",
		"framework_graphics_flags_java_lib",
		"hwui_flags_java_lib",
		@@ -1351,3 +1352,19 @@ java_aconfig_library {
		aconfig_declarations: "backstage_power_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Dropbox data
		aconfig_declarations {
		name: "dropbox_flags",
		package: "com.android.server.feature.flags",
		container: "system",
		srcs: [
		"services/core/java/com/android/server/feature/dropbox_flags.aconfig",
		],
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -234,7 +234,6 @@ java_library_static {
		"android.hidl.manager-V1.2-java",
		"cbor-java",
		"com.android.media.audio-aconfig-java",
		"dropbox_flags_lib",
		"icu4j_calendar_astronomer",
		"android.security.aaid_aidl-java",
		"netd-client",

deleted100644 → 0

+0 −13

Original line number	Diff line number	Diff line
		aconfig_declarations {
		name: "dropbox_flags",
		package: "com.android.server.feature.flags",
		container: "system",
		srcs: [
		"dropbox_flags.aconfig",
		],
		}

		java_aconfig_library {
		name: "dropbox_flags_lib",
		aconfig_declarations: "dropbox_flags",
		}