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
diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index 2149c0c..ba56832 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -79,10 +79,10 @@
}
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 6d204cb..e69fc8d 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -97,7 +97,7 @@
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 f28a8b2..b5f8413 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>