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

Commit b22f66ba authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

codec2 hal: example AIDL service am: 27a3ad12 am: 7613b87c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2727179



Change-Id: Ib223a2594b696f4793c32533735374672ecdc607
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 015326af 7613b87c

media/codec2/hal/services/Android.bp

+17 −13
Original line number Diff line number Diff line
@@ -39,13 +39,17 @@ package { 
}



cc_binary {

    name: "android.hardware.media.c2@1.2-default-service",

    name: "android.hardware.media.c2-default-service",

    vendor: true,

    relative_install_path: "hw",



    init_rc: ["android.hardware.media.c2@1.2-default-service.rc"],

    init_rc: ["android.hardware.media.c2-default-service.rc"],



    defaults: [

        "libcodec2-hidl-defaults",

        "libcodec2-aidl-defaults",

    ],



    defaults: ["libcodec2-hidl-defaults"],

    srcs: [

        "vendor.cpp",

    ],
@@ -54,13 +58,14 @@ cc_binary { 
    shared_libs: [

        "libavservices_minijail",

        "libbinder",

        "libbinder_ndk",

    ],

    required: ["android.hardware.media.c2@1.2-default-seccomp_policy"],

    required: ["android.hardware.media.c2-default-seccomp_policy"],



    // The content in manifest_media_c2_V1_1_default.xml can be included

    // The content in manifest_media_c2_default.xml can be included

    // directly in the main device manifest.xml file or via vintf_fragments.

    // (Remove the line below if the entry is already in the main manifest.)

    vintf_fragments: ["manifest_media_c2_V1_1_default.xml"],

    vintf_fragments: ["manifest_media_c2_default.xml"],



    // Remove this line to enable this module.

    enabled: false,
@@ -73,30 +78,29 @@ cc_binary { 
// Files in the "seccomp_policy" subdirectory are only provided as examples.

// They may not work on some devices and/or architectures without modification.

prebuilt_etc {

    name: "android.hardware.media.c2@1.2-default-seccomp_policy",

    name: "android.hardware.media.c2-default-seccomp_policy",

    vendor: true,

    sub_dir: "seccomp_policy",



    // If a specific architecture is targeted, multiple choices are not needed.

    arch: {

        arm: {

            src: "seccomp_policy/android.hardware.media.c2@1.2-default-arm.policy",

            src: "seccomp_policy/android.hardware.media.c2-default-arm.policy",

        },

        arm64: {

            src: "seccomp_policy/android.hardware.media.c2@1.2-default-arm64.policy",

            src: "seccomp_policy/android.hardware.media.c2-default-arm64.policy",

        },

        riscv64: {

            src: "seccomp_policy/android.hardware.media.c2@1.2-default-riscv64.policy",

            src: "seccomp_policy/android.hardware.media.c2-default-riscv64.policy",

        },

        x86: {

            src: "seccomp_policy/android.hardware.media.c2@1.2-default-x86.policy",

            src: "seccomp_policy/android.hardware.media.c2-default-x86.policy",

        },

        x86_64: {

            src: "seccomp_policy/android.hardware.media.c2@1.2-default-x86_64.policy",

            src: "seccomp_policy/android.hardware.media.c2-default-x86_64.policy",

        },

    },



    // This may be removed.

    required: ["crash_dump.policy"],

}

media/codec2/hal/services/android.hardware.media.c2@1.2-default-service.rc→media/codec2/hal/services/android.hardware.media.c2-default-service.rc

+1 −1
Original line number Diff line number Diff line 
service android-hardware-media-c2-hal-1-2 /vendor/bin/hw/android.hardware.media.c2@1.2-default-service

service android-hardware-media-c2-hal /vendor/bin/hw/android.hardware.media.c2-default-service

    class hal

    user mediacodec

    group camera mediadrm drmrpc

media/codec2/hal/services/manifest_media_c2_V1_0_default.xml

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

    <hal>

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

        <transport>hwbinder</transport>

        <version>1.0</version>

        <interface>

            <name>IComponentStore</name>

            <instance>default</instance>

        </interface>

    </hal>

</manifest>

media/codec2/hal/services/manifest_media_c2_V1_1_default.xml

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

    <hal>

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

        <transport>hwbinder</transport>

        <version>1.1</version>

        <interface>

            <name>IComponentStore</name>

            <instance>default</instance>

        </interface>

    </hal>

</manifest>

media/codec2/hal/services/manifest_media_c2_V1_2_default.xml

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

    <hal>

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

        <transport>hwbinder</transport>

        <version>1.2</version>

        <interface>

            <name>IComponentStore</name>

            <instance>default</instance>

        </interface>

    </hal>

</manifest>