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

Commit 45c5ad3b authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

Merge "Revert "Sync with new drm common aidl interface"" into android15-tests-dev am: 4b93de7e 

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



Change-Id: Ia408ea6259ebf0def7f6d63220fec25cddda6c3c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30ce127f 4b93de7e

drm/libmediadrmrkp/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 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",
@@ -40,7 +39,6 @@ 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

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


    static_libs: [

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

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

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

        "libbase",

        "libclearkeybase",