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

Commit c2340359 authored by Yifan Hong's avatar Yifan Hong
Browse files

DO NOT MERGE disable V matrix. 

Disable 9.xml on the Android 14 branch because
it should not know about the new HALs.

The 9.xml file itself is kept to avoid future
merge conflicts.

Bug: 277379745
Test: TH

Change-Id: I32263830e69080eece47dcc0880be32be02e2a9c
parent d1df1017

compatibility_matrices/Android.bp

+0 −12
Original line number Original line Diff line number Diff line
@@ -82,15 +82,3 @@ vintf_compatibility_matrix { 
        "kernel_config_u_6.1",

        "kernel_config_u_6.1",

    ],

    ],

}
 
}
 


vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.9.xml",

    stem: "compatibility_matrix.9.xml",

    srcs: [

        "compatibility_matrix.9.xml",

    ],

    kernel_configs: [

        "kernel_config_v_5.15",

        "kernel_config_v_6.1",

    ],

}

compatibility_matrices/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -103,7 +103,6 @@ my_system_matrix_deps := \ 
    framework_compatibility_matrix.6.xml \

    framework_compatibility_matrix.6.xml \

    framework_compatibility_matrix.7.xml \

    framework_compatibility_matrix.7.xml \

    framework_compatibility_matrix.8.xml \

    framework_compatibility_matrix.8.xml \

    framework_compatibility_matrix.9.xml \

    framework_compatibility_matrix.device.xml \

    framework_compatibility_matrix.device.xml \





my_framework_matrix_deps += \

my_framework_matrix_deps += \

compatibility_matrices/compatibility_matrix.9.xml

+1 −0
Original line number Original line Diff line number Diff line 
<!-- WARNING: This file is unused in the Android 14 branch. -->

<compatibility-matrix version="1.0" type="framework" level="9">

<compatibility-matrix version="1.0" type="framework" level="9">

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.audio</name>

        <name>android.hardware.audio</name>