Merge "Remove libbinder from libbundleaidl" into main
diff --git a/media/aconfig/Android.bp b/media/aconfig/Android.bp
index f95d723..ee25c03 100644
--- a/media/aconfig/Android.bp
+++ b/media/aconfig/Android.bp
@@ -1,15 +1,18 @@
+// deprecated
aconfig_declarations {
name: "aconfig_mediacodec_flags",
package: "com.android.media.codec.flags",
srcs: ["mediacodec_flags.aconfig"],
}
+// deprecated
java_aconfig_library {
name: "aconfig_mediacodec_flags_java_lib",
aconfig_declarations: "aconfig_mediacodec_flags",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// deprecated
cc_aconfig_library {
name: "aconfig_mediacodec_flags_c_lib",
min_sdk_version: "30",
@@ -21,3 +24,26 @@
],
aconfig_declarations: "aconfig_mediacodec_flags",
}
+
+aconfig_declarations {
+ name: "aconfig_codec_fwk_flags",
+ package: "android.media.codec",
+ srcs: ["codec_fwk.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.media.codec-aconfig-java",
+ aconfig_declarations: "aconfig_codec_fwk_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+cc_aconfig_library {
+ name: "android.media.codec-aconfig-cc",
+ min_sdk_version: "30",
+ vendor_available: true,
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.media.swcodec",
+ ],
+ aconfig_declarations: "aconfig_codec_fwk_flags",
+}
diff --git a/media/aconfig/codec_fwk.aconfig b/media/aconfig/codec_fwk.aconfig
new file mode 100644
index 0000000..183bd99
--- /dev/null
+++ b/media/aconfig/codec_fwk.aconfig
@@ -0,0 +1,26 @@
+# Codec framework feature flags.
+#
+# !!! Please add flags in alphabetical order. !!!
+
+package: "android.media.codec"
+
+flag {
+ name: "dynamic_color_aspects"
+ namespace: "codec_fwk"
+ description: "Feature flag for dynamic color aspect support"
+ bug: "297914560"
+}
+
+flag {
+ name: "hlg_editing"
+ namespace: "codec_fwk"
+ description: "Feature flag for HLG editing support"
+ bug: "316397061"
+}
+
+flag {
+ name: "null_output_surface"
+ namespace: "codec_fwk"
+ description: "Feature flag for null output Surface support"
+ bug: "297920102"
+}
diff --git a/media/aconfig/mediacodec_flags.aconfig b/media/aconfig/mediacodec_flags.aconfig
index c82ad4d..be0fc5c 100644
--- a/media/aconfig/mediacodec_flags.aconfig
+++ b/media/aconfig/mediacodec_flags.aconfig
@@ -1,5 +1,10 @@
package: "com.android.media.codec.flags"
+# ******************************************************************
+# !!! DO NOT ADD FURTHER FLAGS TO THIS FILE !!!
+# !!! USE codec_fwk.aconfig INSTEAD !!!
+# ******************************************************************
+
flag {
name: "large_audio_frame"
namespace: "codec_fwk"