commit 00d903eed6ac61b7d38f41859f28efa89a965448
author Marco Nelissen <marcone@google.com> Thu Oct 03 20:03:44 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 03 20:03:44 2019 +0000
tree cfce1f026bd0dbbc79d9355495915f690724b576
parent 17ddb234235cb1abd2d9b4314aaa2fc5465951b5
parent 3339f23c931b2f7e73258953c6e541888dccfe86

Merge "Update libmediadrm includes"

media/codecs/cmds/codec2.cpp

diff --git a/media/codecs/cmds/codec2.cpp b/media/codecs/cmds/codec2.cpp
index f2cf545..188ba60 100644
--- a/media/codecs/cmds/codec2.cpp
+++ b/media/codecs/cmds/codec2.cpp
@@ -31,7 +31,6 @@
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
 #include <media/DataSource.h>
-#include <media/ICrypto.h>
 #include <media/IMediaHTTPService.h>
 #include <media/MediaSource.h>
 #include <media/stagefright/foundation/ABuffer.h>

media/sfplugin/Android.bp

diff --git a/media/sfplugin/Android.bp b/media/sfplugin/Android.bp
index 5e2e3bd..4f8d571 100644
--- a/media/sfplugin/Android.bp
+++ b/media/sfplugin/Android.bp
@@ -18,6 +18,7 @@
     ],
 
     header_libs: [
+        "libmediadrm_headers",
         "libstagefright_codec2_internal",
     ],
 

media/sfplugin/CCodecBufferChannel.h

diff --git a/media/sfplugin/CCodecBufferChannel.h b/media/sfplugin/CCodecBufferChannel.h
index 431baaa..1b3b605 100644
--- a/media/sfplugin/CCodecBufferChannel.h
+++ b/media/sfplugin/CCodecBufferChannel.h
@@ -31,7 +31,6 @@
 #include <media/stagefright/codec2/1.0/InputSurface.h>
 #include <media/stagefright/foundation/Mutexed.h>
 #include <media/stagefright/CodecBase.h>
-#include <media/ICrypto.h>
 
 #include "InputSurfaceWrapper.h"
 

media/sfplugin/Codec2Buffer.h

diff --git a/media/sfplugin/Codec2Buffer.h b/media/sfplugin/Codec2Buffer.h
index 481975f..d5d41a4 100644
--- a/media/sfplugin/Codec2Buffer.h
+++ b/media/sfplugin/Codec2Buffer.h
@@ -24,7 +24,7 @@
 #include <binder/IMemory.h>
 #include <media/hardware/VideoAPI.h>
 #include <media/MediaCodecBuffer.h>
-#include <media/ICrypto.h>
+#include <mediadrm/ICrypto.h>
 
 namespace android {
 

media/sfplugin/tests/Android.bp

diff --git a/media/sfplugin/tests/Android.bp b/media/sfplugin/tests/Android.bp
index b08d3d6..8a6992f 100644
--- a/media/sfplugin/tests/Android.bp
+++ b/media/sfplugin/tests/Android.bp
@@ -33,6 +33,10 @@
         "hardware/google/av/media/sfplugin",
     ],
 
+    header_libs: [
+        "libmediadrm_headers",
+    ],
+
     shared_libs: [
         "libbinder",
         "libgui",

media/sfplugin/tests/MediaCodec_sanity_test.cpp

diff --git a/media/sfplugin/tests/MediaCodec_sanity_test.cpp b/media/sfplugin/tests/MediaCodec_sanity_test.cpp
index ba3687b..3c43f1f 100644
--- a/media/sfplugin/tests/MediaCodec_sanity_test.cpp
+++ b/media/sfplugin/tests/MediaCodec_sanity_test.cpp
@@ -21,7 +21,6 @@
 #include <binder/ProcessState.h>
 #include <gtest/gtest.h>
 #include <gui/Surface.h>
-#include <media/ICrypto.h>
 #include <media/MediaCodecBuffer.h>
 #include <media/hardware/VideoAPI.h>
 #include <media/stagefright/MediaCodec.h>
@@ -29,6 +28,7 @@
 #include <media/stagefright/foundation/ABuffer.h>
 #include <media/stagefright/foundation/ALooper.h>
 #include <media/stagefright/foundation/AMessage.h>
+#include <mediadrm/ICrypto.h>
 
 namespace android {