From e0bb84be37c5acc8ff84ad657242eca075a75726 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 21 May 2021 00:34:09 +0000 Subject: [PATCH] DO NOT MERGE: Disable current matrix. The current matrix should not be used in Android S. However, it is left here so that any late fixes to the S matrix can be made in a way that will flow downstream. Reason for 'DO NOT MERGE' - avoid landing this change in goog/master, since the current matrix has HALs added there, some devices may be relying on it. In order to allow the (AOSP subset of) the S manifest to be frozen in AOSP, and the current matrix to be enabled from aosp/master -..-> goog/master, this will be reverted in sc-dev-plus-aosp immediately after it merges. Bug: 178221726 Test: boot devices and vts_treble_vintf_vendor_test passes Change-Id: I5716db7cfd629527dd33daac94244e5df41520f5 --- compatibility_matrices/Android.bp | 1 + compatibility_matrices/Android.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp index da55347d25..31fa1ae403 100644 --- a/compatibility_matrices/Android.bp +++ b/compatibility_matrices/Android.bp @@ -75,6 +75,7 @@ vintf_compatibility_matrix { vintf_compatibility_matrix { name: "framework_compatibility_matrix.current.xml", + enabled: false, stem: "compatibility_matrix.current.xml", srcs: [ "compatibility_matrix.current.xml", diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index 9e715bf37d..4cefb5506e 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -102,7 +102,6 @@ my_system_matrix_deps := \ framework_compatibility_matrix.4.xml \ framework_compatibility_matrix.5.xml \ framework_compatibility_matrix.6.xml \ - framework_compatibility_matrix.current.xml \ framework_compatibility_matrix.device.xml \ my_framework_matrix_deps += \