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

Commit 46c35e49 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Define vintf_fragments as modules" into main am: bd25b18f am: c1483ccf 

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



Change-Id: Ifde1f1a455209b88d535143e0fc074889e7eb8ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aafa0782 c1483ccf

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

+8 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ cc_binary { 
    ],

    srcs: ["Service.cpp"],

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

    vintf_fragments: ["android.hardware.drm-service.clearkey.xml"],

    vintf_fragment_modules: ["android.hardware.drm-service.clearkey.xml_vintf"],

}



cc_binary {
@@ -98,7 +98,13 @@ cc_binary { 
    overrides: ["android.hardware.drm-service.clearkey"],

    srcs: ["ServiceLazy.cpp"],

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

    vintf_fragments: ["android.hardware.drm-service.clearkey.xml"],

    vintf_fragment_modules: ["android.hardware.drm-service.clearkey.xml_vintf"],

}



vintf_fragment {

    name: "android.hardware.drm-service.clearkey.xml_vintf",

    src: "android.hardware.drm-service.clearkey.xml",

    vendor: true,

}



cc_binary {