| commit | 7d2c6e8be2c9a4f3c1364d243856a345f17f851e | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Feb 16 16:14:59 2018 -0800 |
| committer | Jeff Tinker <jtinker@google.com> | Fri Feb 16 17:04:00 2018 -0800 |
| tree | 3aab41fe8acce7056a1e7b01ebc2e8882e416b9a | |
| parent | 987ac7056040ed1594dc975c8a9d7cee463fa834 [diff] |
Move mediadrm-related headers Relocate drm and crypto headers from media to mediadrm to have finer grained ownership bug:73556221 Change-Id: I7d1b5944f261f9b1fdeed7605e4c0b4b4ca43e1a
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp index b7c9db7..705f61f 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
@@ -20,7 +20,7 @@ #include "NuPlayerDrm.h" #include <binder/IServiceManager.h> -#include <media/IMediaDrmService.h> +#include <mediadrm/IMediaDrmService.h> #include <utils/Log.h>
diff --git a/media/libmediaplayerservice/tests/DrmSessionManager_test.cpp b/media/libmediaplayerservice/tests/DrmSessionManager_test.cpp index 2c6a41b..d81ee05 100644 --- a/media/libmediaplayerservice/tests/DrmSessionManager_test.cpp +++ b/media/libmediaplayerservice/tests/DrmSessionManager_test.cpp
@@ -20,11 +20,11 @@ #include <gtest/gtest.h> -#include <media/DrmHal.h> -#include <media/DrmSessionClientInterface.h> -#include <media/DrmSessionManager.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/ProcessInfoInterface.h> +#include <mediadrm/DrmHal.h> +#include <mediadrm/DrmSessionClientInterface.h> +#include <mediadrm/DrmSessionManager.h> namespace android {