Merge "Revert "disable V matrix."" into udc-dev-plus-aosp

This commit is contained in:
Steven Moreland 2023-04-24 20:42:41 +00:00 committed by Android (Google) Code Review
commit 60bfc8621a
3 changed files with 13 additions and 1 deletions

View file

@ -82,3 +82,15 @@ vintf_compatibility_matrix {
"kernel_config_u_6.1",
],
}
vintf_compatibility_matrix {
name: "framework_compatibility_matrix.9.xml",
stem: "compatibility_matrix.9.xml",
srcs: [
"compatibility_matrix.9.xml",
],
kernel_configs: [
"kernel_config_v_5.15",
"kernel_config_v_6.1",
],
}

View file

@ -103,6 +103,7 @@ my_system_matrix_deps := \
framework_compatibility_matrix.6.xml \
framework_compatibility_matrix.7.xml \
framework_compatibility_matrix.8.xml \
framework_compatibility_matrix.9.xml \
framework_compatibility_matrix.device.xml \
my_framework_matrix_deps += \

View file

@ -1,4 +1,3 @@
<!-- WARNING: This file is unused in the Android 14 branch. -->
<compatibility-matrix version="1.0" type="framework" level="9">
<hal format="hidl" optional="true">
<name>android.hardware.audio</name>