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

am: 3820d19650 Change-Id: I283af0d0144decb2ab7f478bd7722bbadde428ec
2019-10-02 15:03:39 -07:00
parent 987dff3690 3820d19650
commit 55656ff75c
2 changed files with 5 additions and 5 deletions
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -58,7 +58,10 @@ cc_library_shared {
        "android.hidl.token@1.0-utils",
    ],

-    header_libs: ["libhardware_headers"],
+    header_libs: [
+        "libhardware_headers",
+        "libmediadrm_headers",
+    ],

    static_libs: ["libgrallocusage"],

--- a/media/jni/android_media_MediaDrm.h
+++ b/media/jni/android_media_MediaDrm.h
@@ -20,15 +20,12 @@
 #include "jni.h"

 #include <media/stagefright/foundation/ABase.h>
-#include <media/IDrm.h>
-#include <media/IDrmClient.h>
+#include <mediadrm/IDrm.h>
 #include <utils/Errors.h>
 #include <utils/RefBase.h>

 namespace android {

-struct IDrm;
-
 class DrmListener: virtual public RefBase
 {
 public: