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

Commit fc3a56f6 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "clearkey hidl: add 1.3 services"

parents 7d6d1ef2 12606bad

drm/mediadrm/plugins/clearkey/hidl/Android.bp

+20 −1
Original line number Diff line number Diff line
@@ -78,18 +78,37 @@ cc_library_static { 
    },

    srcs: ["protos/DeviceFiles.proto"],

}



cc_binary {

    name: "android.hardware.drm@1.2-service.clearkey",

    defaults: ["clearkey_service_defaults"],

    srcs: ["service.cpp"],

    init_rc: ["android.hardware.drm@1.2-service.clearkey.rc"],

    vintf_fragments: ["manifest_android.hardware.drm@1.3-service.clearkey.xml"],

    vintf_fragments: ["manifest_android.hardware.drm@1.2-service.clearkey.xml"],

}



cc_binary {

    name: "android.hardware.drm@1.2-service-lazy.clearkey",

    overrides: ["android.hardware.drm@1.2-service.clearkey"],

    defaults: ["clearkey_service_defaults"],

    srcs: ["serviceLazy.cpp"],

    init_rc: ["android.hardware.drm@1.2-service-lazy.clearkey.rc"],

    vintf_fragments: ["manifest_android.hardware.drm@1.2-service.clearkey.xml"],

}



cc_binary {

    name: "android.hardware.drm@1.3-service.clearkey",

    defaults: ["clearkey_service_defaults"],

    srcs: ["service.cpp"],

    init_rc: ["android.hardware.drm@1.3-service.clearkey.rc"],

    vintf_fragments: ["manifest_android.hardware.drm@1.3-service.clearkey.xml"],

}



cc_binary {

    name: "android.hardware.drm@1.3-service-lazy.clearkey",

    overrides: ["android.hardware.drm@1.3-service.clearkey"],

    defaults: ["clearkey_service_defaults"],

    srcs: ["serviceLazy.cpp"],

    init_rc: ["android.hardware.drm@1.3-service-lazy.clearkey.rc"],

    vintf_fragments: ["manifest_android.hardware.drm@1.3-service.clearkey.xml"],

}

drm/mediadrm/plugins/clearkey/hidl/android.hardware.drm@1.2-service-lazy.clearkey.rc

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ service vendor.drm-clearkey-hal-1-2 /vendor/bin/hw/android.hardware.drm@1.2-serv 
    interface android.hardware.drm@1.1::IDrmFactory clearkey

    interface android.hardware.drm@1.2::ICryptoFactory clearkey

    interface android.hardware.drm@1.2::IDrmFactory clearkey

    interface android.hardware.drm@1.3::ICryptoFactory clearkey

    interface android.hardware.drm@1.3::IDrmFactory clearkey

    disabled

    oneshot

    class hal

drm/mediadrm/plugins/clearkey/hidl/android.hardware.drm@1.2-service.clearkey.rc

+1 −2
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ service vendor.drm-clearkey-hal-1-2 /vendor/bin/hw/android.hardware.drm@1.2-serv 
    interface android.hardware.drm@1.1::IDrmFactory clearkey

    interface android.hardware.drm@1.2::ICryptoFactory clearkey

    interface android.hardware.drm@1.2::IDrmFactory clearkey

    interface android.hardware.drm@1.3::ICryptoFactory clearkey

    interface android.hardware.drm@1.3::IDrmFactory clearkey

    disabled

    class hal

    user media

    group media mediadrm

drm/mediadrm/plugins/clearkey/hidl/android.hardware.drm@1.3-service-lazy.clearkey.rc

0 → 100644
+16 −0
Original line number Diff line number Diff line 
service vendor.drm-clearkey-hal-1-3 /vendor/bin/hw/android.hardware.drm@1.3-service-lazy.clearkey

    interface android.hardware.drm@1.0::ICryptoFactory clearkey

    interface android.hardware.drm@1.0::IDrmFactory clearkey

    interface android.hardware.drm@1.1::ICryptoFactory clearkey

    interface android.hardware.drm@1.1::IDrmFactory clearkey

    interface android.hardware.drm@1.2::ICryptoFactory clearkey

    interface android.hardware.drm@1.2::IDrmFactory clearkey

    interface android.hardware.drm@1.3::ICryptoFactory clearkey

    interface android.hardware.drm@1.3::IDrmFactory clearkey

    disabled

    oneshot

    class hal

    user media

    group media mediadrm

    ioprio rt 4

    writepid /dev/cpuset/foreground/tasks

drm/mediadrm/plugins/clearkey/hidl/android.hardware.drm@1.3-service.clearkey.rc

0 → 100644
+14 −0
Original line number Diff line number Diff line 
service vendor.drm-clearkey-hal-1-3 /vendor/bin/hw/android.hardware.drm@1.3-service.clearkey

    interface android.hardware.drm@1.0::ICryptoFactory clearkey

    interface android.hardware.drm@1.0::IDrmFactory clearkey

    interface android.hardware.drm@1.1::ICryptoFactory clearkey

    interface android.hardware.drm@1.1::IDrmFactory clearkey

    interface android.hardware.drm@1.2::ICryptoFactory clearkey

    interface android.hardware.drm@1.2::IDrmFactory clearkey

    interface android.hardware.drm@1.3::ICryptoFactory clearkey

    interface android.hardware.drm@1.3::IDrmFactory clearkey

    class hal

    user media

    group media mediadrm

    ioprio rt 4

    writepid /dev/cpuset/foreground/tasks