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

Commit 5464e337 authored by Huihong Luo's avatar Huihong Luo Committed by Automerger Merge Worker
Browse files

Merge "Sync with new drm common aidl interface" into android15-tests-dev am: 4421b8dd 

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



Change-Id: I01912e288a6affced7d7dfad16a41d19eb730edc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b8a7fe6 4421b8dd

drm/libmediadrmrkp/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ cc_library { 
    ],

    static_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.drm.common-V1-ndk",

        "android.hardware.drm-V1-ndk",

        "android.hardware.security.rkp-V3-ndk",

        "libbase",
@@ -39,6 +40,7 @@ cc_binary { 
    ],

    static_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.drm.common-V1-ndk",

        "android.hardware.drm-V1-ndk",

        "android.hardware.security.rkp-V3-ndk",

        "libbase",

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

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ cc_defaults { 


    static_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.drm.common-V1-ndk",

        "android.hardware.drm-V1-ndk",

        "libbase",

        "libclearkeybase",