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

Commit 4ab06a6f authored by SzuWei Lin's avatar SzuWei Lin Committed by Automerger Merge Worker
Browse files

Merge "Support dynamic 64-bit media service" am: b80ffdeb am: d93e16b7 

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



Change-Id: I88978b14a1d13158b3c5f955b9d6d6b9cedd19a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c409a93 d93e16b7

media/mediaserver/Android.bp

+49 −3
Original line number Diff line number Diff line
@@ -26,7 +26,33 @@ cc_library_static { 
    ],

}



cc_binary {

prebuilt_etc {

    name: "mediaserver.zygote64_32.rc",

    src: "mediaserver.zygote64_32.rc",

    sub_dir: "init/hw",

}



prebuilt_etc {

    name: "mediaserver.zygote64.rc",

    src: "mediaserver.zygote64.rc",

    sub_dir: "init/hw",

}



soong_config_module_type {

    name: "mediaserver_cc_binary",

    module_type: "cc_binary",

    config_namespace: "ANDROID",

    bool_variables: ["TARGET_DYNAMIC_64_32_MEDIASERVER"],

    properties: [

        "compile_multilib",

        "init_rc",

        "multilib.lib32.suffix",

        "multilib.lib64.suffix",

        "required",

    ],

}



mediaserver_cc_binary {

    name: "mediaserver",



    srcs: ["main_mediaserver.cpp"],
@@ -55,12 +81,32 @@ cc_binary { 
    // ****************************************************************

    compile_multilib: "prefer32",



    init_rc: ["mediaserver.rc"],



    cflags: [

        "-Werror",

        "-Wall",

    ],



    vintf_fragments: ["manifest_media_c2_software.xml"],



    soong_config_variables: {

        TARGET_DYNAMIC_64_32_MEDIASERVER: {

            compile_multilib: "both",

            multilib: {

                lib32: {

                    suffix: "32",

                },

                lib64: {

                    suffix: "64",

                },

            },

            required: [

                "mediaserver.zygote64_32.rc",

                "mediaserver.zygote64.rc",

            ],

            init_rc: ["mediaserver_dynamic.rc"],

            conditions_default: {

                init_rc: ["mediaserver.rc"],

            },

        },

    },

}

media/mediaserver/mediaserver.zygote64.rc

0 → 100644
+6 −0
Original line number Diff line number Diff line 
service media /system/bin/mediaserver64

    class main

    user media

    group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm

    ioprio rt 4

    task_profiles ProcessCapacityHigh HighPerformance

media/mediaserver/mediaserver.zygote64_32.rc

0 → 100644
+6 −0
Original line number Diff line number Diff line 
service media /system/bin/mediaserver32

    class main

    user media

    group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm

    ioprio rt 4

    task_profiles ProcessCapacityHigh HighPerformance

media/mediaserver/mediaserver_dynamic.rc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
on property:init.svc.media=*

    setprop init.svc.mediadrm ${init.svc.media}



import /system/etc/init/hw/mediaserver.${ro.zygote}.rc