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

Move mediadrm-related headers

Browse Source 
Relocate drm and crypto headers from media
to mediadrm to have finer grained ownership

bug:73556221

Change-Id: I2f795fd22b6c36c8e4de9bf3b961acb0c1c5485e
This commit is contained in:
Jeff Tinker
2018-02-16 16:24:49 -08:00
parent fd9569e1f6
commit cd4d28fefe
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/jni/android_media_MediaCodec.cpp
View File

@@ -36,7 +36,6 @@
#include <gui/Surface.h>
#include <media/ICrypto.h>
#include <media/MediaCodecBuffer.h>
#include <media/stagefright/MediaCodec.h>
#include <media/stagefright/foundation/ABuffer.h>
@@ -46,6 +45,7 @@
#include <media/stagefright/foundation/AString.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/PersistentSurface.h>
#include <mediadrm/ICrypto.h>
#include <nativehelper/ScopedLocalRef.h>
#include <system/window.h>

4
media/jni/android_media_MediaCrypto.cpp
View File

@@ -26,9 +26,9 @@
#include <binder/IServiceManager.h>
#include <cutils/properties.h>
#include <media/ICrypto.h>
#include <media/IMediaDrmService.h>
#include <media/stagefright/foundation/ADebug.h>
#include <mediadrm/ICrypto.h>
#include <mediadrm/IMediaDrmService.h>
namespace android {

4
media/jni/android_media_MediaDrm.cpp
View File

@@ -31,10 +31,10 @@
#include <binder/Parcel.h>
#include <binder/PersistableBundle.h>
#include <cutils/properties.h>
#include <media/IDrm.h>
#include <media/IMediaDrmService.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaErrors.h>
#include <mediadrm/IDrm.h>
#include <mediadrm/IMediaDrmService.h>
using ::android::os::PersistableBundle;