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

Commit bc490291 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 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
(cherry picked from commit e0bb84be)
parent b91c1c48

compatibility_matrices/Android.bp

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

compatibility_matrices/Android.mk

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