diff options
| author | Marco Nelissen <marcone@google.com> | 2019-10-02 15:03:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-02 15:03:39 -0700 |
| commit | 55656ff75c160478cb4e7d417c4db6ca777f2f29 (patch) | |
| tree | ef889ec719b8fd40a75c4788e7c513473a44e575 | |
| parent | 987dff3690d26e26ca70aa93c549793af5a20f21 (diff) | |
| parent | 3820d19650dce9993854bbc8de90641e4db592d9 (diff) | |
Merge "Fix DRM includes" into qt-r1-dev-plus-aosp
am: 3820d19650
Change-Id: I283af0d0144decb2ab7f478bd7722bbadde428ec
| -rw-r--r-- | media/jni/Android.bp | 5 | ||||
| -rw-r--r-- | media/jni/android_media_MediaDrm.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/jni/Android.bp b/media/jni/Android.bp index 378064d63af4..d0a47f73f04a 100644 --- 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"], diff --git a/media/jni/android_media_MediaDrm.h b/media/jni/android_media_MediaDrm.h index 5ebac1d61648..684069b0120a 100644 --- 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: |