commit 5f679f3debc5de7070515f35ee17152c046fdcc3
author Devin Moore <devinmoore@google.com> Mon Oct 30 22:38:29 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 30 22:38:29 2023 +0000
tree 0e5b24baae4a666c5e09d00cc17445475b345c7e
parent 93139269399f5b95f0f0b1bee548786c105fd0e9

Revert "Remove Q matrices"

Revert submission 2808255-deprecate_android_q

Reason for revert: Broke a device build that is targeting Q b/308482858

Reverted changes: /q/submissionid:2808255-deprecate_android_q

Change-Id: Icc5250b219b8500bbd98eba0d20c637c76b734e6

compatibility_matrices/Android.bp

diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index 7844ac8..712f28a 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -22,6 +22,19 @@
 }
 
 vintf_compatibility_matrix {
+    name: "framework_compatibility_matrix.4.xml",
+    stem: "compatibility_matrix.4.xml",
+    srcs: [
+        "compatibility_matrix.4.xml",
+    ],
+    kernel_configs: [
+        "kernel_config_q_4.14",
+        "kernel_config_q_4.19",
+    ],
+    core_hals: "only",
+}
+
+vintf_compatibility_matrix {
     name: "framework_compatibility_matrix.5.xml",
     stem: "compatibility_matrix.5.xml",
     srcs: [