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

Commit a47b0774 authored by Devin Moore's avatar Devin Moore
Browse files

[conflict] Merge "Rename compatibility_matrix.9.xml to... 

[conflict] Merge "Rename compatibility_matrix.9.xml to compatibility_matrix.202404.xml" into main am: 89c395a8 am: 98625270 am: e3467980

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2907790



Needed to copy the existing compatibility_matrix.9.xml from this target branch to the new compatibility_matrix.202404.xml file.

Change-Id: I71ef6ce9b6039ed757caa5ddc257970732a454e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dabe4a79 e3467980

compatibility_matrices/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ vintf_compatibility_matrix { 
}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.9.xml",

    stem: "compatibility_matrix.9.xml",

    name: "framework_compatibility_matrix.202404.xml",

    stem: "compatibility_matrix.202404.xml",

    srcs: [

        "compatibility_matrix.9.xml",

        "compatibility_matrix.202404.xml",

    ],

    kernel_configs: [

        "kernel_config_v_6.1",

compatibility_matrices/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ my_system_matrix_deps := \ 
# interfaces (in the `next` release configuration).

ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)

my_system_matrix_deps += \

    framework_compatibility_matrix.9.xml

    framework_compatibility_matrix.202404.xml

endif



my_framework_matrix_deps += \

compatibility_matrices/compatibility_matrix.9.xml→compatibility_matrices/compatibility_matrix.202404.xml

+1 −1
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework" level="9">

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

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

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

        <version>1-2</version>