From c2340359de15f4c363197a5ac32691c131cba2e3 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 12 Apr 2023 14:45:26 -0700
Subject: [PATCH] DO NOT MERGE disable V matrix.

Disable 9.xml on the Android 14 branch because
it should not know about the new HALs.

The 9.xml file itself is kept to avoid future
merge conflicts.

Bug: 277379745
Test: TH

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

diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index b3ca29309d..93b5380e27 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -82,15 +82,3 @@ 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 a82a421ff4..6e4c4193f7 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -103,7 +103,6 @@ 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 4c24acd766..188746d79b 100644
--- a/compatibility_matrices/compatibility_matrix.9.xml
+++ b/compatibility_matrices/compatibility_matrix.9.xml
@@ -1,3 +1,4 @@
+<!-- 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>