Merge "Remove HIDL media.c2 from the 202404 FCM" into main

This commit is contained in:
Devin Moore 2024-02-09 19:55:42 +00:00 committed by Gerrit Code Review
commit e2955b27df
3 changed files with 1 additions and 33 deletions

View file

@ -82,11 +82,3 @@ vintf_compatibility_matrix {
"kernel_config_v_6.6",
],
}
vintf_compatibility_matrix {
name: "framework_compatibility_matrix.tmp.xml",
stem: "compatibility_matrix.tmp.xml",
srcs: [
"compatibility_matrix.tmp.xml",
],
}

View file

@ -112,7 +112,7 @@ my_system_matrix_deps := \
ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
my_system_matrix_deps += \
framework_compatibility_matrix.202404.xml \
framework_compatibility_matrix.tmp.xml
endif
my_framework_matrix_deps += \

View file

@ -1,24 +0,0 @@
<compatibility-matrix version="1.0" type="framework" level="202404">
<!-- This file holds the HIDL media.c2 interface while it
is being deprecated. This will be removed after the flag ramping
complete. This interface is not allowed in the 202404 vendor interface -->
<hal format="hidl" optional="true">
<name>android.hardware.media.c2</name>
<version>1.0-2</version>
<interface>
<name>IComponentStore</name>
<instance>software</instance>
<regex-instance>default[0-9]*</regex-instance>
<regex-instance>vendor[0-9]*_software</regex-instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.media.c2</name>
<version>1.0</version>
<interface>
<name>IConfigurable</name>
<instance>default</instance>
<instance>software</instance>
</interface>
</hal>
</compatibility-matrix>