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

Commit 3820d196 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fix DRM includes" into qt-r1-dev-plus-aosp

parents 55f89f61 b01ef144

media/jni/Android.bp

+4 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,10 @@ cc_library_shared { 
        "android.hidl.token@1.0-utils",

        "android.hidl.token@1.0-utils",

    ],

    ],





    header_libs: ["libhardware_headers"],

    header_libs: [

        "libhardware_headers",

        "libmediadrm_headers",

    ],





    static_libs: ["libgrallocusage"],

    static_libs: ["libgrallocusage"],

media/jni/android_media_MediaDrm.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -20,15 +20,12 @@ 
#include "jni.h"

#include "jni.h"





#include <media/stagefright/foundation/ABase.h>

#include <media/stagefright/foundation/ABase.h>

#include <media/IDrm.h>

#include <mediadrm/IDrm.h>

#include <media/IDrmClient.h>

#include <utils/Errors.h>

#include <utils/Errors.h>

#include <utils/RefBase.h>

#include <utils/RefBase.h>





namespace android {

namespace android {





struct IDrm;



class DrmListener: virtual public RefBase

class DrmListener: virtual public RefBase

{

{

public:

public: