Merge "Fix DRM includes"

2019-10-03 20:03:44 +00:00
parent 363a602bd1 3495d4f857
commit 46f3e8f929
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: