Merge "[Large Audio frame support] Add aconfig feature flags" into main am: dcd31c4112 am: 024b8de250 am: 597092d26a
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2761445
Change-Id: Iddfd27327f7586acf0daa39dd797d9c43d7dea50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/aconfig/Android.bp b/media/aconfig/Android.bp
new file mode 100644
index 0000000..4b489e2
--- /dev/null
+++ b/media/aconfig/Android.bp
@@ -0,0 +1,16 @@
+aconfig_declarations {
+ name: "aconfig_mediacodec_flags",
+ package: "com.android.media.codec.flags",
+ srcs: ["mediacodec_flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "aconfig_mediacodec_flags_java_lib",
+ aconfig_declarations: "aconfig_mediacodec_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+cc_aconfig_library {
+ name: "aconfig_mediacodec_flags_c_lib",
+ aconfig_declarations: "aconfig_mediacodec_flags",
+}
diff --git a/media/aconfig/mediacodec_flags.aconfig b/media/aconfig/mediacodec_flags.aconfig
new file mode 100644
index 0000000..67ba3e5
--- /dev/null
+++ b/media/aconfig/mediacodec_flags.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.media.codec.flags"
+
+flag {
+ name: "large_audio_frame"
+ namespace: "codec_fwk"
+ description: "Feature flags for large audio frame support"
+ bug: "297219557"
+}