Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marco Nelissen
2019-10-02 21:18:28 +00:00
committed by Android (Google) Code Review
parent 55f89f61d3 b01ef14470
commit 3820d19650
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/Android.bp
View File

@@ -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"],

5
media/jni/android_media_MediaDrm.h
View File

@@ -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: