Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7938a23 authored by Steven Moreland's avatar Steven Moreland
Browse files

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
parent e35b07b0

compatibility_matrices/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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",

compatibility_matrices/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -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 += \