Remove HIDL media.c2 from the 202404 FCM
HIDL is no longer supported in devices targeting 202404 vendor
interface.
This removes the tmp FCM fragment that was being used to declare the
media.c2 HIDL dependency.
Test: m && launch_cvd
Bug: 218588089
Change-Id: I40973f5cdc9f4c9ca891929c8e8f865119322c17
diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index b21fe54..dd502ba 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -82,11 +82,3 @@
"kernel_config_v_6.6",
],
}
-
-vintf_compatibility_matrix {
- name: "framework_compatibility_matrix.tmp.xml",
- stem: "compatibility_matrix.tmp.xml",
- srcs: [
- "compatibility_matrix.tmp.xml",
- ],
-}
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index 76dbdd6..639abf9 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -112,7 +112,7 @@
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 += \
diff --git a/compatibility_matrices/compatibility_matrix.tmp.xml b/compatibility_matrices/compatibility_matrix.tmp.xml
deleted file mode 100644
index 85e3c4c..0000000
--- a/compatibility_matrices/compatibility_matrix.tmp.xml
+++ /dev/null
@@ -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>