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

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

Remove HIDL media C2 from 202404 compatibility matrix 

Put it in its own FCM so it's easier to manage while HIDL C2 is being
depregated with flagging.

This interface will not be allowed in the 202404 vendor interface.

Test: launch_cvd
Bug: 218588089
Change-Id: I24e14db4edd161a574a4404c8b7271c91dc1243a
parent 4c416418

compatibility_matrices/Android.bp

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

        "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 Original line Diff line number Diff line
@@ -112,7 +112,8 @@ my_system_matrix_deps := \ 
# interfaces (in the `next` release configuration).

# interfaces (in the `next` release configuration).

ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)

ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)

my_system_matrix_deps += \

my_system_matrix_deps += \

    framework_compatibility_matrix.202404.xml

    framework_compatibility_matrix.202404.xml \

    framework_compatibility_matrix.tmp.xml

endif

endif





my_framework_matrix_deps += \

my_framework_matrix_deps += \

compatibility_matrices/compatibility_matrix.202404.xml

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

            <instance>default</instance>

        </interface>

        </interface>

    </hal>

    </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">

    <hal format="aidl">

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

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

        <version>1</version>

        <version>1</version>

compatibility_matrices/compatibility_matrix.tmp.xml

0 → 100644
+24 −0
Original line number Original line 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>