From 23791a9f8757facd294fa15324c37a13bfbc50e8 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 24 Apr 2023 16:30:08 +0000
Subject: [PATCH] Revert "disable V matrix."

This reverts commit c2340359de15f4c363197a5ac32691c131cba2e3.

Reason for revert: re-enable on udc-dev-plus-aosp b/c DO NOT| MERGE
barrier is configured there.

Change-Id: I0602be91d7e26b4cf090700497fde6425b4540c8
---
 compatibility_matrices/Android.bp                 | 12 ++++++++++++
 compatibility_matrices/Android.mk                 |  1 +
 compatibility_matrices/compatibility_matrix.9.xml |  1 -
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index 93b5380e27..b3ca29309d 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -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",
+    ],
+}
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index 6e4c4193f7..a82a421ff4 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -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 += \
diff --git a/compatibility_matrices/compatibility_matrix.9.xml b/compatibility_matrices/compatibility_matrix.9.xml
index ac707be256..3f05e9e574 100644
--- a/compatibility_matrices/compatibility_matrix.9.xml
+++ b/compatibility_matrices/compatibility_matrix.9.xml
@@ -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>