Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d60fd8d authored Feb 06, 2024 by Oriol Prieto Gascó Committed by Automerger Merge Worker Feb 06, 2024

Merge "Set the container field of aconfig flags" into main am: 2a4da891 am: 0d0cd679

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2949168

Change-Id: I1dfa9a504a5694be7622bbda803b8e6ed990516f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 7709d8f3 0d0cd679

media/aconfig/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,7 @@
	aconfig_declarations {		aconfig_declarations {
	name: "aconfig_mediacodec_flags",		name: "aconfig_mediacodec_flags",
	package: "com.android.media.codec.flags",		package: "com.android.media.codec.flags",
			container: "system",
	srcs: ["mediacodec_flags.aconfig"],		srcs: ["mediacodec_flags.aconfig"],
	}		}

	@@ -28,6 +29,7 @@ cc_aconfig_library {
	aconfig_declarations {		aconfig_declarations {
	name: "aconfig_codec_fwk_flags",		name: "aconfig_codec_fwk_flags",
	package: "android.media.codec",		package: "android.media.codec",
			container: "system",
	srcs: ["codec_fwk.aconfig"],		srcs: ["codec_fwk.aconfig"],
	}		}

media/aconfig/codec_fwk.aconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,7 @@
	# !!! Please add flags in alphabetical order. !!!		# !!! Please add flags in alphabetical order. !!!

	package: "android.media.codec"		package: "android.media.codec"
			container: "system"

	flag {		flag {
	name: "aidl_hal_input_surface"		name: "aidl_hal_input_surface"

media/aconfig/mediacodec_flags.aconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	package: "com.android.media.codec.flags"		package: "com.android.media.codec.flags"
			container: "system"

	# ******************************************************************		# ******************************************************************
	# !!! DO NOT ADD FURTHER FLAGS TO THIS FILE !!!		# !!! DO NOT ADD FURTHER FLAGS TO THIS FILE !!!