From a37ed88ebba9d60ab9a23ddd66fb16d36f9ce36c Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Wed, 25 Mar 2020 15:14:21 -0700
Subject: [PATCH 1/2] bpfmt compat matrix Android.bp

Bug: 147496715
Test: n/A
Change-Id: I2748d4a74f0bfc668f6ff0f8bce22c94dd90f61f
---
 compatibility_matrices/Android.bp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index 33157a6fb8..2149c0cd91 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -23,8 +23,9 @@ vintf_compatibility_matrix {
         "kernel_config_o_3.18",
         "kernel_config_o_4.4",
         "kernel_config_o_4.9",
-    ]
+    ],
 }
+
 vintf_compatibility_matrix {
     name: "framework_compatibility_matrix.1.xml",
     stem: "compatibility_matrix.1.xml",
@@ -35,8 +36,9 @@ vintf_compatibility_matrix {
         "kernel_config_o_3.18",
         "kernel_config_o_4.4",
         "kernel_config_o_4.9",
-    ]
+    ],
 }
+
 vintf_compatibility_matrix {
     name: "framework_compatibility_matrix.2.xml",
     stem: "compatibility_matrix.2.xml",
@@ -47,7 +49,7 @@ vintf_compatibility_matrix {
         "kernel_config_o_mr1_3.18",
         "kernel_config_o_mr1_4.4",
         "kernel_config_o_mr1_4.9",
-    ]
+    ],
 }
 
 vintf_compatibility_matrix {
@@ -60,7 +62,7 @@ vintf_compatibility_matrix {
         "kernel_config_p_4.4",
         "kernel_config_p_4.9",
         "kernel_config_p_4.14",
-    ]
+    ],
 }
 
 vintf_compatibility_matrix {
@@ -73,7 +75,7 @@ vintf_compatibility_matrix {
         "kernel_config_q_4.9",
         "kernel_config_q_4.14",
         "kernel_config_q_4.19",
-    ]
+    ],
 }
 
 vintf_compatibility_matrix {
@@ -86,5 +88,5 @@ vintf_compatibility_matrix {
         "kernel_config_r_4.14",
         "kernel_config_r_4.19",
         "kernel_config_r_5.4",
-    ]
+    ],
 }

From 8c583d85b64db2fd8d72e2550cae4342724ea2ef Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Wed, 25 Mar 2020 14:59:05 -0700
Subject: [PATCH 2/2] Freeze 'current' matrix as '5'.

To signify this as being ready for release.

Bug: 147496715
Test: build & boot cf (which is at target-level 5)
Change-Id: I7bb9d561506849bac2353d9356a6580f6e2393ab
---
 compatibility_matrices/Android.bp                           | 6 +++---
 compatibility_matrices/Android.mk                           | 2 +-
 ...bility_matrix.current.xml => compatibility_matrix.5.xml} | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename compatibility_matrices/{compatibility_matrix.current.xml => compatibility_matrix.5.xml} (98%)

diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index 2149c0cd91..ba56832bdd 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -79,10 +79,10 @@ vintf_compatibility_matrix {
 }
 
 vintf_compatibility_matrix {
-    name: "framework_compatibility_matrix.current.xml",
-    stem: "compatibility_matrix.current.xml",
+    name: "framework_compatibility_matrix.5.xml",
+    stem: "compatibility_matrix.5.xml",
     srcs: [
-        "compatibility_matrix.current.xml",
+        "compatibility_matrix.5.xml",
     ],
     kernel_configs: [
         "kernel_config_r_4.14",
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index 6d204cb952..e69fc8dbca 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -97,7 +97,7 @@ my_system_matrix_deps := \
     framework_compatibility_matrix.2.xml \
     framework_compatibility_matrix.3.xml \
     framework_compatibility_matrix.4.xml \
-    framework_compatibility_matrix.current.xml \
+    framework_compatibility_matrix.5.xml \
     framework_compatibility_matrix.device.xml \
 
 my_framework_matrix_deps += \
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.5.xml
similarity index 98%
rename from compatibility_matrices/compatibility_matrix.current.xml
rename to compatibility_matrices/compatibility_matrix.5.xml
index f28a8b2ef6..b5f8413058 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.5.xml
@@ -217,7 +217,7 @@
     </hal>
     <hal format="hidl" optional="false">
         <name>android.hardware.graphics.allocator</name>
-        <!-- TODO(b/136016160): deprecating 2.0. New devices should not use this -->
+        <!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->
         <version>2.0</version>
         <version>3.0</version>
         <version>4.0</version>
@@ -236,7 +236,7 @@
     </hal>
     <hal format="hidl" optional="false">
         <name>android.hardware.graphics.mapper</name>
-        <!-- TODO(b/136016160): deprecating 2.1. New devices should not use this -->
+        <!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->
         <version>2.1</version>
         <version>3.0</version>
         <version>4.0</version>