diff options
| author | Steven Moreland <smoreland@google.com> | 2022-04-23 00:12:09 +0000 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2022-04-28 00:38:24 +0000 |
| commit | e7938a23bbf538037fd7d850905f77137909218f (patch) | |
| tree | bb70327ddb72d665a90f948df0c2aa54cd408192 /compatibility_matrices | |
| parent | e35b07b08945601768dd0c390358b7cc73cd00c8 (diff) | |
DO NOT MERGE: Disable current matrix.
The current matrix should not be used in Android T. However, it is left
here so that any late fixes to the T 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 T manifest to be frozen in
AOSP, and the current matrix to be enabled from aosp/master -..->
goog/master, this will be reverted in tm-dev-plus-aosp immediately after
it merges.
Bug: 203103997
Test: boot devices and vts_treble_vintf_vendor_test passes
Change-Id: I15bacedd0820e0086a742b97ee18e097ef8086e5
Diffstat (limited to 'compatibility_matrices')
| -rw-r--r-- | compatibility_matrices/Android.bp | 1 | ||||
| -rw-r--r-- | compatibility_matrices/Android.mk | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp index 524242f6d3..422b37e68c 100644 --- a/compatibility_matrices/Android.bp +++ b/compatibility_matrices/Android.bp @@ -87,6 +87,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 d19f0dae1f..d6a44d0177 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -103,7 +103,6 @@ my_system_matrix_deps := \ framework_compatibility_matrix.5.xml \ framework_compatibility_matrix.6.xml \ framework_compatibility_matrix.7.xml \ - framework_compatibility_matrix.current.xml \ framework_compatibility_matrix.device.xml \ my_framework_matrix_deps += \ |