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

Commit 07cf4177 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge changes I7bb9d561,I2748d4a7 into rvc-dev am: 0df912df 

Change-Id: Ie7a29679a51049acfa04667270ad5fd3ce41cef0
parents 865c3071 0df912df

compatibility_matrices/Android.bp

+11 −9
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@ vintf_compatibility_matrix { 
        "kernel_config_o_3.18",

        "kernel_config_o_4.4",

        "kernel_config_o_4.9",

    ]

    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.1.xml",

    stem: "compatibility_matrix.1.xml",
@@ -35,8 +36,9 @@ vintf_compatibility_matrix { 
        "kernel_config_o_3.18",

        "kernel_config_o_4.4",

        "kernel_config_o_4.9",

    ]

    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.2.xml",

    stem: "compatibility_matrix.2.xml",
@@ -47,7 +49,7 @@ vintf_compatibility_matrix { 
        "kernel_config_o_mr1_3.18",

        "kernel_config_o_mr1_4.4",

        "kernel_config_o_mr1_4.9",

    ]

    ],

}



vintf_compatibility_matrix {
@@ -60,7 +62,7 @@ vintf_compatibility_matrix { 
        "kernel_config_p_4.4",

        "kernel_config_p_4.9",

        "kernel_config_p_4.14",

    ]

    ],

}



vintf_compatibility_matrix {
@@ -73,18 +75,18 @@ vintf_compatibility_matrix { 
        "kernel_config_q_4.9",

        "kernel_config_q_4.14",

        "kernel_config_q_4.19",

    ]

    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.current.xml",

    stem: "compatibility_matrix.current.xml",

    name: "framework_compatibility_matrix.5.xml",

    stem: "compatibility_matrix.5.xml",

    srcs: [

        "compatibility_matrix.current.xml",

        "compatibility_matrix.5.xml",

    ],

    kernel_configs: [

        "kernel_config_r_4.14",

        "kernel_config_r_4.19",

        "kernel_config_r_5.4",

    ]

    ],

}

compatibility_matrices/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ my_system_matrix_deps := \ 
    framework_compatibility_matrix.2.xml \

    framework_compatibility_matrix.3.xml \

    framework_compatibility_matrix.4.xml \

    framework_compatibility_matrix.current.xml \

    framework_compatibility_matrix.5.xml \

    framework_compatibility_matrix.device.xml \



my_framework_matrix_deps += \

compatibility_matrices/compatibility_matrix.current.xml→compatibility_matrices/compatibility_matrix.5.xml

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
    </hal>

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

        <name>android.hardware.graphics.allocator</name>

        <!-- TODO(b/136016160): deprecating 2.0. New devices should not use this -->

        <!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->

        <version>2.0</version>

        <version>3.0</version>

        <version>4.0</version>
@@ -236,7 +236,7 @@ 
    </hal>

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

        <name>android.hardware.graphics.mapper</name>

        <!-- TODO(b/136016160): deprecating 2.1. New devices should not use this -->

        <!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->

        <version>2.1</version>

        <version>3.0</version>

        <version>4.0</version>