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

Commit 6d5334a0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove HIDL media C2 from 202404 compatibility matrix" into main am: 10e58a2c 

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



Change-Id: Ib33b7aa111910dac1762a7a5271071a8b8368e0e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4800ac0a 10e58a2c

compatibility_matrices/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -94,3 +94,11 @@ vintf_compatibility_matrix { 
        "kernel_config_v_6.6",

    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.tmp.xml",

    stem: "compatibility_matrix.tmp.xml",

    srcs: [

        "compatibility_matrix.tmp.xml",

    ],

}

compatibility_matrices/Android.mk

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

ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)

my_system_matrix_deps += \

    framework_compatibility_matrix.202404.xml

    framework_compatibility_matrix.202404.xml \

    framework_compatibility_matrix.tmp.xml

endif



my_framework_matrix_deps += \

compatibility_matrices/compatibility_matrix.202404.xml

+0 −19
Original line number Diff line number Diff line
@@ -343,25 +343,6 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>android.hardware.media.c2</name>

        <version>1.0-2</version>

        <interface>

            <name>IComponentStore</name>

            <instance>software</instance>

            <regex-instance>default[0-9]*</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>android.hardware.media.c2</name>

        <version>1.0</version>

        <interface>

            <name>IConfigurable</name>

            <instance>default</instance>

            <instance>software</instance>

        </interface>

    </hal>

    <hal format="aidl">

        <name>android.hardware.media.c2</name>

        <version>1</version>

compatibility_matrices/compatibility_matrix.tmp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework" level="202404">

  <!-- This file holds the HIDL media.c2 interface while it

  is being deprecated. This will be removed after the flag ramping

  complete. This interface is not allowed in the 202404 vendor interface -->

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

        <name>android.hardware.media.c2</name>

        <version>1.0-2</version>

        <interface>

            <name>IComponentStore</name>

            <instance>software</instance>

            <regex-instance>default[0-9]*</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.c2</name>

        <version>1.0</version>

        <interface>

            <name>IConfigurable</name>

            <instance>default</instance>

            <instance>software</instance>

        </interface>

    </hal>

</compatibility-matrix>