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

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

Consolidate mediaserver manifest files for `next` 

Now that we build mainline modules from source on `next` we need to add
both the HIDL and the AIDL manifest fragments on all release configs.

Test: dumpsys media.player
Bug: 327508501
Change-Id: I798defcc1bd3267dd8e67b2bd5853668d973d969
parent e84d9f36

media/mediaserver/Android.bp

+1 −10
Original line number Diff line number Diff line
@@ -85,16 +85,7 @@ mediaserver_cc_binary { 
        "-Wall",

    ],



    // AIDL is only used when release_aidl_use_unfrozen is true

    // because the swcodec mainline module is a prebuilt from an

    // Android U branch in that case.

    // TODO(b/327508501)

    vintf_fragments: ["manifest_media_c2_software_hidl.xml"],

    product_variables: {

        release_aidl_use_unfrozen: {

            vintf_fragments: ["manifest_media_c2_software_aidl.xml"],

        },

    },

    vintf_fragments: ["manifest_media_c2_software.xml"],



    soong_config_variables: {

        TARGET_DYNAMIC_64_32_MEDIASERVER: {

media/mediaserver/manifest_media_c2_software_hidl.xml→media/mediaserver/manifest_media_c2_software.xml

+5 −0
Original line number Diff line number Diff line
@@ -8,4 +8,9 @@ 
            <instance>software</instance>

        </interface>

    </hal>

    <hal format="aidl">

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

        <version>1</version>

        <fqname>IComponentStore/software</fqname>

    </hal>

</manifest>

media/mediaserver/manifest_media_c2_software_aidl.xml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<manifest version="1.0" type="framework">

    <hal format="aidl">

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

        <version>1</version>

        <fqname>IComponentStore/software</fqname>

    </hal>

</manifest>