diff options
| author | Marco Nelissen <marcone@google.com> | 2019-10-03 13:25:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-03 13:25:20 -0700 |
| commit | 2d0a8c4bf731ee4364825f52c0cbf723c0d87420 (patch) | |
| tree | 4e936d1a45b584c6130459a639ad0ab0820671b6 /media | |
| parent | a88e9959ddfc0db942b37b40384cfd505e17b457 (diff) | |
| parent | 00d903eed6ac61b7d38f41859f28efa89a965448 (diff) | |
| download | av-2d0a8c4bf731ee4364825f52c0cbf723c0d87420.tar.gz | |
Merge "Update libmediadrm includes"
am: 00d903eed6
Change-Id: I9f091336516e250ff56d769fce467496bc7b633b
Diffstat (limited to 'media')
| -rw-r--r-- | media/codecs/cmds/codec2.cpp | 1 | ||||
| -rw-r--r-- | media/sfplugin/Android.bp | 1 | ||||
| -rw-r--r-- | media/sfplugin/CCodecBufferChannel.h | 1 | ||||
| -rw-r--r-- | media/sfplugin/Codec2Buffer.h | 2 | ||||
| -rw-r--r-- | media/sfplugin/tests/Android.bp | 4 | ||||
| -rw-r--r-- | media/sfplugin/tests/MediaCodec_sanity_test.cpp | 2 |
6 files changed, 7 insertions, 4 deletions
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> 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 @@ cc_library_shared { ], header_libs: [ + "libmediadrm_headers", "libstagefright_codec2_internal", ], 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" 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 { 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 @@ cc_test { "hardware/google/av/media/sfplugin", ], + header_libs: [ + "libmediadrm_headers", + ], + shared_libs: [ "libbinder", "libgui", 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 { |