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

Commit 27df13a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support dynamic 64-bit drmserver" into udc-dev am: 6afa26c7 am: 54d5e2ae 

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



Change-Id: Ia33b49bf92196b994fc11bed56a5f2a629fc0464
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9a58d33 54d5e2ae

drm/drmserver/Android.bp

+48 −2
Original line number Original line Diff line number Diff line
@@ -31,7 +31,33 @@ license { 
    ],

    ],

}

}





cc_binary {

prebuilt_etc {

    name: "drmserver.zygote64_32.rc",

    src: "drmserver.zygote64_32.rc",

    sub_dir: "init/hw",

}



prebuilt_etc {

    name: "drmserver.zygote64.rc",

    src: "drmserver.zygote64.rc",

    sub_dir: "init/hw",

}



soong_config_module_type {

    name: "drmserver_cc_binary",

    module_type: "cc_binary",

    config_namespace: "ANDROID",

    bool_variables: ["TARGET_DYNAMIC_64_32_DRMSERVER"],

    properties: [

        "compile_multilib",

        "init_rc",

        "multilib.lib32.suffix",

        "multilib.lib64.suffix",

        "required",

    ],

}



drmserver_cc_binary {

    name: "drmserver",

    name: "drmserver",





    srcs: [

    srcs: [
@@ -61,7 +87,27 @@ cc_binary { 




    compile_multilib: "prefer32",

    compile_multilib: "prefer32",





    soong_config_variables: {

        TARGET_DYNAMIC_64_32_DRMSERVER: {

            compile_multilib: "both",

            multilib: {

                lib32: {

                    suffix: "32",

                },

                lib64: {

                    suffix: "64",

                },

            },

            required: [

                "drmserver.zygote64_32.rc",

                "drmserver.zygote64.rc",

            ],

            init_rc: ["drmserver_dynamic.rc"],

            conditions_default: {

                init_rc: ["drmserver.rc"],

                init_rc: ["drmserver.rc"],

            },

        },

    },

}

}





cc_fuzz {

cc_fuzz {

drm/drmserver/drmserver.zygote64.rc

0 → 100644
+6 −0
Original line number Original line Diff line number Diff line 
service drm /system/bin/drmserver64

    disabled

    class main

    user drm

    group drm system inet drmrpc readproc

    task_profiles ProcessCapacityHigh

drm/drmserver/drmserver.zygote64_32.rc

0 → 100644
+6 −0
Original line number Original line Diff line number Diff line 
service drm /system/bin/drmserver32

    disabled

    class main

    user drm

    group drm system inet drmrpc readproc

    task_profiles ProcessCapacityHigh

drm/drmserver/drmserver_dynamic.rc

0 → 100644
+7 −0
Original line number Original line Diff line number Diff line 
import /system/etc/init/hw/drmserver.${ro.zygote}.rc



on property:drm.service.enabled=true

    start drm



on property:drm.service.enabled=1

    start drm