Fix libmedia includes.
Test: works with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: Idb6319563dfe83807d32ee54eb2fe66346c9f54a
diff --git a/include/media/AVSyncSettings.h b/include/media/AVSyncSettings.h
index 4b48419..bbe211f 120000
--- a/include/media/AVSyncSettings.h
+++ b/include/media/AVSyncSettings.h
@@ -1 +1 @@
-../../media/libmedia/include/AVSyncSettings.h
\ No newline at end of file
+../../media/libmedia/include/media/AVSyncSettings.h
\ No newline at end of file
diff --git a/include/media/BufferProviders.h b/include/media/BufferProviders.h
index a1fd855..779bb15 120000
--- a/include/media/BufferProviders.h
+++ b/include/media/BufferProviders.h
@@ -1 +1 @@
-../../media/libmedia/include/BufferProviders.h
\ No newline at end of file
+../../media/libmedia/include/media/BufferProviders.h
\ No newline at end of file
diff --git a/include/media/BufferingSettings.h b/include/media/BufferingSettings.h
index fb4ec97..409203f 120000
--- a/include/media/BufferingSettings.h
+++ b/include/media/BufferingSettings.h
@@ -1 +1 @@
-../../media/libmedia/include/BufferingSettings.h
\ No newline at end of file
+../../media/libmedia/include/media/BufferingSettings.h
\ No newline at end of file
diff --git a/include/media/CharacterEncodingDetector.h b/include/media/CharacterEncodingDetector.h
index f23ed4c..2b28387 120000
--- a/include/media/CharacterEncodingDetector.h
+++ b/include/media/CharacterEncodingDetector.h
@@ -1 +1 @@
-../../media/libmedia/include/CharacterEncodingDetector.h
\ No newline at end of file
+../../media/libmedia/include/media/CharacterEncodingDetector.h
\ No newline at end of file
diff --git a/include/media/Crypto.h b/include/media/Crypto.h
index 778f6fe..9af6495 120000
--- a/include/media/Crypto.h
+++ b/include/media/Crypto.h
@@ -1 +1 @@
-../../media/libmedia/include/Crypto.h
\ No newline at end of file
+../../media/libmedia/include/media/Crypto.h
\ No newline at end of file
diff --git a/include/media/CryptoHal.h b/include/media/CryptoHal.h
index 81f31f5..92f3137 120000
--- a/include/media/CryptoHal.h
+++ b/include/media/CryptoHal.h
@@ -1 +1 @@
-../../media/libmedia/include/CryptoHal.h
\ No newline at end of file
+../../media/libmedia/include/media/CryptoHal.h
\ No newline at end of file
diff --git a/include/media/Drm.h b/include/media/Drm.h
index d9bfa5c..ac60003 120000
--- a/include/media/Drm.h
+++ b/include/media/Drm.h
@@ -1 +1 @@
-../../media/libmedia/include/Drm.h
\ No newline at end of file
+../../media/libmedia/include/media/Drm.h
\ No newline at end of file
diff --git a/include/media/DrmHal.h b/include/media/DrmHal.h
index 21ba37b..17bb667 120000
--- a/include/media/DrmHal.h
+++ b/include/media/DrmHal.h
@@ -1 +1 @@
-../../media/libmedia/include/DrmHal.h
\ No newline at end of file
+../../media/libmedia/include/media/DrmHal.h
\ No newline at end of file
diff --git a/include/media/DrmPluginPath.h b/include/media/DrmPluginPath.h
index 06b12cf..9e05194 120000
--- a/include/media/DrmPluginPath.h
+++ b/include/media/DrmPluginPath.h
@@ -1 +1 @@
-../../media/libmedia/include/DrmPluginPath.h
\ No newline at end of file
+../../media/libmedia/include/media/DrmPluginPath.h
\ No newline at end of file
diff --git a/include/media/DrmSessionClientInterface.h b/include/media/DrmSessionClientInterface.h
index 72090a3..f4e3211 120000
--- a/include/media/DrmSessionClientInterface.h
+++ b/include/media/DrmSessionClientInterface.h
@@ -1 +1 @@
-../../media/libmedia/include/DrmSessionClientInterface.h
\ No newline at end of file
+../../media/libmedia/include/media/DrmSessionClientInterface.h
\ No newline at end of file
diff --git a/include/media/DrmSessionManager.h b/include/media/DrmSessionManager.h
index 47200f7..f0a47bf 120000
--- a/include/media/DrmSessionManager.h
+++ b/include/media/DrmSessionManager.h
@@ -1 +1 @@
-../../media/libmedia/include/DrmSessionManager.h
\ No newline at end of file
+../../media/libmedia/include/media/DrmSessionManager.h
\ No newline at end of file
diff --git a/include/media/ExtendedAudioBufferProvider.h b/include/media/ExtendedAudioBufferProvider.h
index 9497be1..d653cc3 120000
--- a/include/media/ExtendedAudioBufferProvider.h
+++ b/include/media/ExtendedAudioBufferProvider.h
@@ -1 +1 @@
-../../media/libmedia/include/ExtendedAudioBufferProvider.h
\ No newline at end of file
+../../media/libmedia/include/media/ExtendedAudioBufferProvider.h
\ No newline at end of file
diff --git a/include/media/ICrypto.h b/include/media/ICrypto.h
index 53c547a..b250e07 120000
--- a/include/media/ICrypto.h
+++ b/include/media/ICrypto.h
@@ -1 +1 @@
-../../media/libmedia/include/ICrypto.h
\ No newline at end of file
+../../media/libmedia/include/media/ICrypto.h
\ No newline at end of file
diff --git a/include/media/IDataSource.h b/include/media/IDataSource.h
index 7ac813f..41cdd8b 120000
--- a/include/media/IDataSource.h
+++ b/include/media/IDataSource.h
@@ -1 +1 @@
-../../media/libmedia/include/IDataSource.h
\ No newline at end of file
+../../media/libmedia/include/media/IDataSource.h
\ No newline at end of file
diff --git a/include/media/IDrm.h b/include/media/IDrm.h
index eb2f0ec..841bb1b 120000
--- a/include/media/IDrm.h
+++ b/include/media/IDrm.h
@@ -1 +1 @@
-../../media/libmedia/include/IDrm.h
\ No newline at end of file
+../../media/libmedia/include/media/IDrm.h
\ No newline at end of file
diff --git a/include/media/IDrmClient.h b/include/media/IDrmClient.h
index 4d8b50c..10aa5c0 120000
--- a/include/media/IDrmClient.h
+++ b/include/media/IDrmClient.h
@@ -1 +1 @@
-../../media/libmedia/include/IDrmClient.h
\ No newline at end of file
+../../media/libmedia/include/media/IDrmClient.h
\ No newline at end of file
diff --git a/include/media/IHDCP.h b/include/media/IHDCP.h
index f1e112e..9d4568e 120000
--- a/include/media/IHDCP.h
+++ b/include/media/IHDCP.h
@@ -1 +1 @@
-../../media/libmedia/include/IHDCP.h
\ No newline at end of file
+../../media/libmedia/include/media/IHDCP.h
\ No newline at end of file
diff --git a/include/media/IMediaCodecList.h b/include/media/IMediaCodecList.h
index 2e30503..2186312 120000
--- a/include/media/IMediaCodecList.h
+++ b/include/media/IMediaCodecList.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaCodecList.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaCodecList.h
\ No newline at end of file
diff --git a/include/media/IMediaCodecService.h b/include/media/IMediaCodecService.h
index 5103277..37f6822 120000
--- a/include/media/IMediaCodecService.h
+++ b/include/media/IMediaCodecService.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaCodecService.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaCodecService.h
\ No newline at end of file
diff --git a/include/media/IMediaDeathNotifier.h b/include/media/IMediaDeathNotifier.h
index 74b1656..ce3b8f0 120000
--- a/include/media/IMediaDeathNotifier.h
+++ b/include/media/IMediaDeathNotifier.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaDeathNotifier.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaDeathNotifier.h
\ No newline at end of file
diff --git a/include/media/IMediaDrmService.h b/include/media/IMediaDrmService.h
index 6efbc48..f3c260f 120000
--- a/include/media/IMediaDrmService.h
+++ b/include/media/IMediaDrmService.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaDrmService.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaDrmService.h
\ No newline at end of file
diff --git a/include/media/IMediaExtractor.h b/include/media/IMediaExtractor.h
index c17c4eb..8708c8c 120000
--- a/include/media/IMediaExtractor.h
+++ b/include/media/IMediaExtractor.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaExtractor.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaExtractor.h
\ No newline at end of file
diff --git a/include/media/IMediaExtractorService.h b/include/media/IMediaExtractorService.h
index 1e6e8b4..3ee9f1e 120000
--- a/include/media/IMediaExtractorService.h
+++ b/include/media/IMediaExtractorService.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaExtractorService.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaExtractorService.h
\ No newline at end of file
diff --git a/include/media/IMediaHTTPConnection.h b/include/media/IMediaHTTPConnection.h
index 9e544fe..0970c15 120000
--- a/include/media/IMediaHTTPConnection.h
+++ b/include/media/IMediaHTTPConnection.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaHTTPConnection.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaHTTPConnection.h
\ No newline at end of file
diff --git a/include/media/IMediaHTTPService.h b/include/media/IMediaHTTPService.h
index 6312e06..b90c34f 120000
--- a/include/media/IMediaHTTPService.h
+++ b/include/media/IMediaHTTPService.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaHTTPService.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaHTTPService.h
\ No newline at end of file
diff --git a/include/media/IMediaLogService.h b/include/media/IMediaLogService.h
new file mode 120000
index 0000000..245a29d
--- /dev/null
+++ b/include/media/IMediaLogService.h
@@ -0,0 +1 @@
+../../media/libmedia/include/media/IMediaLogService.h
\ No newline at end of file
diff --git a/include/media/IMediaMetadataRetriever.h b/include/media/IMediaMetadataRetriever.h
index c2dd811..959df1a 120000
--- a/include/media/IMediaMetadataRetriever.h
+++ b/include/media/IMediaMetadataRetriever.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaMetadataRetriever.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaMetadataRetriever.h
\ No newline at end of file
diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h
index a38baf4..9414d37 120000
--- a/include/media/IMediaPlayer.h
+++ b/include/media/IMediaPlayer.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaPlayer.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaPlayer.h
\ No newline at end of file
diff --git a/include/media/IMediaPlayerClient.h b/include/media/IMediaPlayerClient.h
index 1c27dee..b6547ce 120000
--- a/include/media/IMediaPlayerClient.h
+++ b/include/media/IMediaPlayerClient.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaPlayerClient.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaPlayerClient.h
\ No newline at end of file
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h
index 08a6a98..89c96cd 120000
--- a/include/media/IMediaPlayerService.h
+++ b/include/media/IMediaPlayerService.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaPlayerService.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaPlayerService.h
\ No newline at end of file
diff --git a/include/media/IMediaRecorder.h b/include/media/IMediaRecorder.h
index c8b8b29..57d192c 120000
--- a/include/media/IMediaRecorder.h
+++ b/include/media/IMediaRecorder.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaRecorder.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaRecorder.h
\ No newline at end of file
diff --git a/include/media/IMediaRecorderClient.h b/include/media/IMediaRecorderClient.h
index ab703aa..89f4359 120000
--- a/include/media/IMediaRecorderClient.h
+++ b/include/media/IMediaRecorderClient.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaRecorderClient.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaRecorderClient.h
\ No newline at end of file
diff --git a/include/media/IMediaSource.h b/include/media/IMediaSource.h
index 1c3d8fe..1330ad3 120000
--- a/include/media/IMediaSource.h
+++ b/include/media/IMediaSource.h
@@ -1 +1 @@
-../../media/libmedia/include/IMediaSource.h
\ No newline at end of file
+../../media/libmedia/include/media/IMediaSource.h
\ No newline at end of file
diff --git a/include/media/IOMX.h b/include/media/IOMX.h
index 989d9b2..6d5b375 120000
--- a/include/media/IOMX.h
+++ b/include/media/IOMX.h
@@ -1 +1 @@
-../../media/libmedia/include/IOMX.h
\ No newline at end of file
+../../media/libmedia/include/media/IOMX.h
\ No newline at end of file
diff --git a/include/media/IRemoteDisplay.h b/include/media/IRemoteDisplay.h
index 5aa58b9..4b0cf10 120000
--- a/include/media/IRemoteDisplay.h
+++ b/include/media/IRemoteDisplay.h
@@ -1 +1 @@
-../../media/libmedia/include/IRemoteDisplay.h
\ No newline at end of file
+../../media/libmedia/include/media/IRemoteDisplay.h
\ No newline at end of file
diff --git a/include/media/IRemoteDisplayClient.h b/include/media/IRemoteDisplayClient.h
index 2d212e7..f29a2ee 120000
--- a/include/media/IRemoteDisplayClient.h
+++ b/include/media/IRemoteDisplayClient.h
@@ -1 +1 @@
-../../media/libmedia/include/IRemoteDisplayClient.h
\ No newline at end of file
+../../media/libmedia/include/media/IRemoteDisplayClient.h
\ No newline at end of file
diff --git a/include/media/IResourceManagerClient.h b/include/media/IResourceManagerClient.h
index 1531ae2..100af9b 120000
--- a/include/media/IResourceManagerClient.h
+++ b/include/media/IResourceManagerClient.h
@@ -1 +1 @@
-../../media/libmedia/include/IResourceManagerClient.h
\ No newline at end of file
+../../media/libmedia/include/media/IResourceManagerClient.h
\ No newline at end of file
diff --git a/include/media/IResourceManagerService.h b/include/media/IResourceManagerService.h
index 007aecb..9b389c6 120000
--- a/include/media/IResourceManagerService.h
+++ b/include/media/IResourceManagerService.h
@@ -1 +1 @@
-../../media/libmedia/include/IResourceManagerService.h
\ No newline at end of file
+../../media/libmedia/include/media/IResourceManagerService.h
\ No newline at end of file
diff --git a/include/media/IStreamSource.h b/include/media/IStreamSource.h
index 90dbbf2..4943af9 120000
--- a/include/media/IStreamSource.h
+++ b/include/media/IStreamSource.h
@@ -1 +1 @@
-../../media/libmedia/include/IStreamSource.h
\ No newline at end of file
+../../media/libmedia/include/media/IStreamSource.h
\ No newline at end of file
diff --git a/include/media/JetPlayer.h b/include/media/JetPlayer.h
index cabfb79..5483fda 120000
--- a/include/media/JetPlayer.h
+++ b/include/media/JetPlayer.h
@@ -1 +1 @@
-../../media/libmedia/include/JetPlayer.h
\ No newline at end of file
+../../media/libmedia/include/media/JetPlayer.h
\ No newline at end of file
diff --git a/include/media/LinearMap.h b/include/media/LinearMap.h
index 3e89686..30d4ca8 120000
--- a/include/media/LinearMap.h
+++ b/include/media/LinearMap.h
@@ -1 +1 @@
-../../media/libmedia/include/LinearMap.h
\ No newline at end of file
+../../media/libmedia/include/media/LinearMap.h
\ No newline at end of file
diff --git a/include/media/MediaCodecBuffer.h b/include/media/MediaCodecBuffer.h
index 60b7e70..8c9aa76 120000
--- a/include/media/MediaCodecBuffer.h
+++ b/include/media/MediaCodecBuffer.h
@@ -1 +1 @@
-../../media/libmedia/include/MediaCodecBuffer.h
\ No newline at end of file
+../../media/libmedia/include/media/MediaCodecBuffer.h
\ No newline at end of file
diff --git a/include/media/MediaCodecInfo.h b/include/media/MediaCodecInfo.h
index 22b10bb..ff44ce4 120000
--- a/include/media/MediaCodecInfo.h
+++ b/include/media/MediaCodecInfo.h
@@ -1 +1 @@
-../../media/libmedia/include/MediaCodecInfo.h
\ No newline at end of file
+../../media/libmedia/include/media/MediaCodecInfo.h
\ No newline at end of file
diff --git a/include/media/MediaDefs.h b/include/media/MediaDefs.h
index 993729d..9850603 120000
--- a/include/media/MediaDefs.h
+++ b/include/media/MediaDefs.h
@@ -1 +1 @@
-../../media/libmedia/include/MediaDefs.h
\ No newline at end of file
+../../media/libmedia/include/media/MediaDefs.h
\ No newline at end of file
diff --git a/include/media/MediaMetadataRetrieverInterface.h b/include/media/MediaMetadataRetrieverInterface.h
index a09f9bb..1c53511 120000
--- a/include/media/MediaMetadataRetrieverInterface.h
+++ b/include/media/MediaMetadataRetrieverInterface.h
@@ -1 +1 @@
-../../media/libmedia/include/MediaMetadataRetrieverInterface.h
\ No newline at end of file
+../../media/libmedia/include/media/MediaMetadataRetrieverInterface.h
\ No newline at end of file
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h
index 86958e4..651c6e6 120000
--- a/include/media/MediaProfiles.h
+++ b/include/media/MediaProfiles.h
@@ -1 +1 @@
-../../media/libmedia/include/MediaProfiles.h
\ No newline at end of file
+../../media/libmedia/include/media/MediaProfiles.h
\ No newline at end of file
diff --git a/include/media/MediaRecorderBase.h b/include/media/MediaRecorderBase.h
index 6080258..e40f992 120000
--- a/include/media/MediaRecorderBase.h
+++ b/include/media/MediaRecorderBase.h
@@ -1 +1 @@
-../../media/libmedia/include/MediaRecorderBase.h
\ No newline at end of file
+../../media/libmedia/include/media/MediaRecorderBase.h
\ No newline at end of file
diff --git a/include/media/MediaResource.h b/include/media/MediaResource.h
index aaf931a..91346aa 120000
--- a/include/media/MediaResource.h
+++ b/include/media/MediaResource.h
@@ -1 +1 @@
-../../media/libmedia/include/MediaResource.h
\ No newline at end of file
+../../media/libmedia/include/media/MediaResource.h
\ No newline at end of file
diff --git a/include/media/MediaResourcePolicy.h b/include/media/MediaResourcePolicy.h
index d56b09f..5d165ee 120000
--- a/include/media/MediaResourcePolicy.h
+++ b/include/media/MediaResourcePolicy.h
@@ -1 +1 @@
-../../media/libmedia/include/MediaResourcePolicy.h
\ No newline at end of file
+../../media/libmedia/include/media/MediaResourcePolicy.h
\ No newline at end of file
diff --git a/include/media/MemoryLeakTrackUtil.h b/include/media/MemoryLeakTrackUtil.h
index cfeac14..504173e 120000
--- a/include/media/MemoryLeakTrackUtil.h
+++ b/include/media/MemoryLeakTrackUtil.h
@@ -1 +1 @@
-../../media/libmedia/include/MemoryLeakTrackUtil.h
\ No newline at end of file
+../../media/libmedia/include/media/MemoryLeakTrackUtil.h
\ No newline at end of file
diff --git a/include/media/Metadata.h b/include/media/Metadata.h
index 4a5893d..e421168 120000
--- a/include/media/Metadata.h
+++ b/include/media/Metadata.h
@@ -1 +1 @@
-../../media/libmedia/include/Metadata.h
\ No newline at end of file
+../../media/libmedia/include/media/Metadata.h
\ No newline at end of file
diff --git a/include/media/MidiDeviceInfo.h b/include/media/MidiDeviceInfo.h
index 55ac9f5..95da7cf 120000
--- a/include/media/MidiDeviceInfo.h
+++ b/include/media/MidiDeviceInfo.h
@@ -1 +1 @@
-../../media/libmedia/include/MidiDeviceInfo.h
\ No newline at end of file
+../../media/libmedia/include/media/MidiDeviceInfo.h
\ No newline at end of file
diff --git a/include/media/MidiIoWrapper.h b/include/media/MidiIoWrapper.h
index a3fe892..786ec3d 120000
--- a/include/media/MidiIoWrapper.h
+++ b/include/media/MidiIoWrapper.h
@@ -1 +1 @@
-../../media/libmedia/include/MidiIoWrapper.h
\ No newline at end of file
+../../media/libmedia/include/media/MidiIoWrapper.h
\ No newline at end of file
diff --git a/include/media/Modulo.h b/include/media/Modulo.h
index 58f31a4..989c4cb 120000
--- a/include/media/Modulo.h
+++ b/include/media/Modulo.h
@@ -1 +1 @@
-../../media/libmedia/include/Modulo.h
\ No newline at end of file
+../../media/libmedia/include/media/Modulo.h
\ No newline at end of file
diff --git a/include/media/OMXBuffer.h b/include/media/OMXBuffer.h
index 9defe79..00db207 120000
--- a/include/media/OMXBuffer.h
+++ b/include/media/OMXBuffer.h
@@ -1 +1 @@
-../../media/libmedia/include/OMXBuffer.h
\ No newline at end of file
+../../media/libmedia/include/media/OMXBuffer.h
\ No newline at end of file
diff --git a/include/media/OMXFenceParcelable.h b/include/media/OMXFenceParcelable.h
index 2e996dd..c4c1b0a 120000
--- a/include/media/OMXFenceParcelable.h
+++ b/include/media/OMXFenceParcelable.h
@@ -1 +1 @@
-../../media/libmedia/include/OMXFenceParcelable.h
\ No newline at end of file
+../../media/libmedia/include/media/OMXFenceParcelable.h
\ No newline at end of file
diff --git a/include/media/PluginLoader.h b/include/media/PluginLoader.h
index f67f2c4..9101735 120000
--- a/include/media/PluginLoader.h
+++ b/include/media/PluginLoader.h
@@ -1 +1 @@
-../../media/libmedia/include/PluginLoader.h
\ No newline at end of file
+../../media/libmedia/include/media/PluginLoader.h
\ No newline at end of file
diff --git a/include/media/RecordBufferConverter.h b/include/media/RecordBufferConverter.h
index b9ee8df..2d7bc0c 120000
--- a/include/media/RecordBufferConverter.h
+++ b/include/media/RecordBufferConverter.h
@@ -1 +1 @@
-../../media/libmedia/include/RecordBufferConverter.h
\ No newline at end of file
+../../media/libmedia/include/media/RecordBufferConverter.h
\ No newline at end of file
diff --git a/include/media/RingBuffer.h b/include/media/RingBuffer.h
index 84f4943..9af28d5 120000
--- a/include/media/RingBuffer.h
+++ b/include/media/RingBuffer.h
@@ -1 +1 @@
-../../media/libmedia/include/RingBuffer.h
\ No newline at end of file
+../../media/libmedia/include/media/RingBuffer.h
\ No newline at end of file
diff --git a/include/media/SharedLibrary.h b/include/media/SharedLibrary.h
index a2a040f..9f8f5a4 120000
--- a/include/media/SharedLibrary.h
+++ b/include/media/SharedLibrary.h
@@ -1 +1 @@
-../../media/libmedia/include/SharedLibrary.h
\ No newline at end of file
+../../media/libmedia/include/media/SharedLibrary.h
\ No newline at end of file
diff --git a/include/media/SingleStateQueue.h b/include/media/SingleStateQueue.h
index 7dda0d8..619f6ee 120000
--- a/include/media/SingleStateQueue.h
+++ b/include/media/SingleStateQueue.h
@@ -1 +1 @@
-../../media/libmedia/include/SingleStateQueue.h
\ No newline at end of file
+../../media/libmedia/include/media/SingleStateQueue.h
\ No newline at end of file
diff --git a/include/media/StringArray.h b/include/media/StringArray.h
index 5061652..616ce6c 120000
--- a/include/media/StringArray.h
+++ b/include/media/StringArray.h
@@ -1 +1 @@
-../../media/libmedia/include/StringArray.h
\ No newline at end of file
+../../media/libmedia/include/media/StringArray.h
\ No newline at end of file
diff --git a/include/media/TypeConverter.h b/include/media/TypeConverter.h
index 9109aaa..837af44 120000
--- a/include/media/TypeConverter.h
+++ b/include/media/TypeConverter.h
@@ -1 +1 @@
-../../media/libmedia/include/TypeConverter.h
\ No newline at end of file
+../../media/libmedia/include/media/TypeConverter.h
\ No newline at end of file
diff --git a/include/media/Visualizer.h b/include/media/Visualizer.h
index fca8b86..ed2ec15 120000
--- a/include/media/Visualizer.h
+++ b/include/media/Visualizer.h
@@ -1 +1 @@
-../../media/libmedia/include/Visualizer.h
\ No newline at end of file
+../../media/libmedia/include/media/Visualizer.h
\ No newline at end of file
diff --git a/include/media/convert.h b/include/media/convert.h
index 3e09482..cb0d00d 120000
--- a/include/media/convert.h
+++ b/include/media/convert.h
@@ -1 +1 @@
-../../media/libmedia/include/convert.h
\ No newline at end of file
+../../media/libmedia/include/media/convert.h
\ No newline at end of file
diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h
index 1992b05..b401bab 120000
--- a/include/media/mediametadataretriever.h
+++ b/include/media/mediametadataretriever.h
@@ -1 +1 @@
-../../media/libmedia/include/mediametadataretriever.h
\ No newline at end of file
+../../media/libmedia/include/media/mediametadataretriever.h
\ No newline at end of file
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h
index 2b1d298..06d537b 120000
--- a/include/media/mediaplayer.h
+++ b/include/media/mediaplayer.h
@@ -1 +1 @@
-../../media/libmedia/include/mediaplayer.h
\ No newline at end of file
+../../media/libmedia/include/media/mediaplayer.h
\ No newline at end of file
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h
index 08c826f..a24deb3 120000
--- a/include/media/mediarecorder.h
+++ b/include/media/mediarecorder.h
@@ -1 +1 @@
-../../media/libmedia/include/mediarecorder.h
\ No newline at end of file
+../../media/libmedia/include/media/mediarecorder.h
\ No newline at end of file
diff --git a/include/media/mediascanner.h b/include/media/mediascanner.h
index 42c3507..91479e0 120000
--- a/include/media/mediascanner.h
+++ b/include/media/mediascanner.h
@@ -1 +1 @@
-../../media/libmedia/include/mediascanner.h
\ No newline at end of file
+../../media/libmedia/include/media/mediascanner.h
\ No newline at end of file
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index b0bd22e..e2d48a2 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -86,6 +86,8 @@
android.hardware.media.omx@1.0 \
android.hidl.memory@1.0 \
+LOCAL_HEADER_LIBRARIES := libmedia_headers
+
# for memory heap analysis
LOCAL_STATIC_LIBRARIES := libc_malloc_debug_backtrace libc_logging
diff --git a/media/libmedia/include/IMediaLogService.h b/media/libmedia/include/IMediaLogService.h
deleted file mode 100644
index 1f5777e..0000000
--- a/media/libmedia/include/IMediaLogService.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_IMEDIALOGSERVICE_H
-#define ANDROID_IMEDIALOGSERVICE_H
-
-#include <binder/IInterface.h>
-#include <binder/IMemory.h>
-#include <binder/Parcel.h>
-
-namespace android {
-
-class IMediaLogService: public IInterface
-{
-public:
- DECLARE_META_INTERFACE(MediaLogService);
-
- virtual void registerWriter(const sp<IMemory>& shared, size_t size, const char *name) = 0;
- virtual void unregisterWriter(const sp<IMemory>& shared) = 0;
-
-};
-
-class BnMediaLogService: public BnInterface<IMediaLogService>
-{
-public:
- virtual status_t onTransact(uint32_t code, const Parcel& data, Parcel* reply,
- uint32_t flags = 0);
-};
-
-} // namespace android
-
-#endif // ANDROID_IMEDIALOGSERVICE_H
diff --git a/media/libmedia/include/AVSyncSettings.h b/media/libmedia/include/media/AVSyncSettings.h
similarity index 100%
rename from media/libmedia/include/AVSyncSettings.h
rename to media/libmedia/include/media/AVSyncSettings.h
diff --git a/media/libmedia/include/BufferProviders.h b/media/libmedia/include/media/BufferProviders.h
similarity index 100%
rename from media/libmedia/include/BufferProviders.h
rename to media/libmedia/include/media/BufferProviders.h
diff --git a/media/libmedia/include/BufferingSettings.h b/media/libmedia/include/media/BufferingSettings.h
similarity index 100%
rename from media/libmedia/include/BufferingSettings.h
rename to media/libmedia/include/media/BufferingSettings.h
diff --git a/media/libmedia/include/CharacterEncodingDetector.h b/media/libmedia/include/media/CharacterEncodingDetector.h
similarity index 100%
rename from media/libmedia/include/CharacterEncodingDetector.h
rename to media/libmedia/include/media/CharacterEncodingDetector.h
diff --git a/media/libmedia/include/Crypto.h b/media/libmedia/include/media/Crypto.h
similarity index 100%
rename from media/libmedia/include/Crypto.h
rename to media/libmedia/include/media/Crypto.h
diff --git a/media/libmedia/include/CryptoHal.h b/media/libmedia/include/media/CryptoHal.h
similarity index 100%
rename from media/libmedia/include/CryptoHal.h
rename to media/libmedia/include/media/CryptoHal.h
diff --git a/media/libmedia/include/Drm.h b/media/libmedia/include/media/Drm.h
similarity index 100%
rename from media/libmedia/include/Drm.h
rename to media/libmedia/include/media/Drm.h
diff --git a/media/libmedia/include/DrmHal.h b/media/libmedia/include/media/DrmHal.h
similarity index 100%
rename from media/libmedia/include/DrmHal.h
rename to media/libmedia/include/media/DrmHal.h
diff --git a/media/libmedia/include/DrmPluginPath.h b/media/libmedia/include/media/DrmPluginPath.h
similarity index 100%
rename from media/libmedia/include/DrmPluginPath.h
rename to media/libmedia/include/media/DrmPluginPath.h
diff --git a/media/libmedia/include/DrmSessionClientInterface.h b/media/libmedia/include/media/DrmSessionClientInterface.h
similarity index 100%
rename from media/libmedia/include/DrmSessionClientInterface.h
rename to media/libmedia/include/media/DrmSessionClientInterface.h
diff --git a/media/libmedia/include/DrmSessionManager.h b/media/libmedia/include/media/DrmSessionManager.h
similarity index 100%
rename from media/libmedia/include/DrmSessionManager.h
rename to media/libmedia/include/media/DrmSessionManager.h
diff --git a/media/libmedia/include/ExtendedAudioBufferProvider.h b/media/libmedia/include/media/ExtendedAudioBufferProvider.h
similarity index 100%
rename from media/libmedia/include/ExtendedAudioBufferProvider.h
rename to media/libmedia/include/media/ExtendedAudioBufferProvider.h
diff --git a/media/libmedia/include/ICrypto.h b/media/libmedia/include/media/ICrypto.h
similarity index 100%
rename from media/libmedia/include/ICrypto.h
rename to media/libmedia/include/media/ICrypto.h
diff --git a/media/libmedia/include/IDataSource.h b/media/libmedia/include/media/IDataSource.h
similarity index 100%
rename from media/libmedia/include/IDataSource.h
rename to media/libmedia/include/media/IDataSource.h
diff --git a/media/libmedia/include/IDrm.h b/media/libmedia/include/media/IDrm.h
similarity index 100%
rename from media/libmedia/include/IDrm.h
rename to media/libmedia/include/media/IDrm.h
diff --git a/media/libmedia/include/IDrmClient.h b/media/libmedia/include/media/IDrmClient.h
similarity index 100%
rename from media/libmedia/include/IDrmClient.h
rename to media/libmedia/include/media/IDrmClient.h
diff --git a/media/libmedia/include/IHDCP.h b/media/libmedia/include/media/IHDCP.h
similarity index 100%
rename from media/libmedia/include/IHDCP.h
rename to media/libmedia/include/media/IHDCP.h
diff --git a/media/libmedia/include/IMediaCodecList.h b/media/libmedia/include/media/IMediaCodecList.h
similarity index 100%
rename from media/libmedia/include/IMediaCodecList.h
rename to media/libmedia/include/media/IMediaCodecList.h
diff --git a/media/libmedia/include/IMediaCodecService.h b/media/libmedia/include/media/IMediaCodecService.h
similarity index 100%
rename from media/libmedia/include/IMediaCodecService.h
rename to media/libmedia/include/media/IMediaCodecService.h
diff --git a/media/libmedia/include/IMediaDeathNotifier.h b/media/libmedia/include/media/IMediaDeathNotifier.h
similarity index 100%
rename from media/libmedia/include/IMediaDeathNotifier.h
rename to media/libmedia/include/media/IMediaDeathNotifier.h
diff --git a/media/libmedia/include/IMediaDrmService.h b/media/libmedia/include/media/IMediaDrmService.h
similarity index 100%
rename from media/libmedia/include/IMediaDrmService.h
rename to media/libmedia/include/media/IMediaDrmService.h
diff --git a/media/libmedia/include/IMediaExtractor.h b/media/libmedia/include/media/IMediaExtractor.h
similarity index 100%
rename from media/libmedia/include/IMediaExtractor.h
rename to media/libmedia/include/media/IMediaExtractor.h
diff --git a/media/libmedia/include/IMediaExtractorService.h b/media/libmedia/include/media/IMediaExtractorService.h
similarity index 100%
rename from media/libmedia/include/IMediaExtractorService.h
rename to media/libmedia/include/media/IMediaExtractorService.h
diff --git a/media/libmedia/include/IMediaHTTPConnection.h b/media/libmedia/include/media/IMediaHTTPConnection.h
similarity index 100%
rename from media/libmedia/include/IMediaHTTPConnection.h
rename to media/libmedia/include/media/IMediaHTTPConnection.h
diff --git a/media/libmedia/include/IMediaHTTPService.h b/media/libmedia/include/media/IMediaHTTPService.h
similarity index 100%
rename from media/libmedia/include/IMediaHTTPService.h
rename to media/libmedia/include/media/IMediaHTTPService.h
diff --git a/include/media/IMediaLogService.h b/media/libmedia/include/media/IMediaLogService.h
similarity index 99%
rename from include/media/IMediaLogService.h
rename to media/libmedia/include/media/IMediaLogService.h
index 0f09e0d..1df1907 100644
--- a/include/media/IMediaLogService.h
+++ b/media/libmedia/include/media/IMediaLogService.h
@@ -30,8 +30,8 @@
virtual void registerWriter(const sp<IMemory>& shared, size_t size, const char *name) = 0;
virtual void unregisterWriter(const sp<IMemory>& shared) = 0;
- virtual void requestMergeWakeup() = 0;
+ virtual void requestMergeWakeup() = 0;
};
class BnMediaLogService: public BnInterface<IMediaLogService>
diff --git a/media/libmedia/include/IMediaMetadataRetriever.h b/media/libmedia/include/media/IMediaMetadataRetriever.h
similarity index 100%
rename from media/libmedia/include/IMediaMetadataRetriever.h
rename to media/libmedia/include/media/IMediaMetadataRetriever.h
diff --git a/media/libmedia/include/IMediaPlayer.h b/media/libmedia/include/media/IMediaPlayer.h
similarity index 100%
rename from media/libmedia/include/IMediaPlayer.h
rename to media/libmedia/include/media/IMediaPlayer.h
diff --git a/media/libmedia/include/IMediaPlayerClient.h b/media/libmedia/include/media/IMediaPlayerClient.h
similarity index 100%
rename from media/libmedia/include/IMediaPlayerClient.h
rename to media/libmedia/include/media/IMediaPlayerClient.h
diff --git a/media/libmedia/include/IMediaPlayerService.h b/media/libmedia/include/media/IMediaPlayerService.h
similarity index 100%
rename from media/libmedia/include/IMediaPlayerService.h
rename to media/libmedia/include/media/IMediaPlayerService.h
diff --git a/media/libmedia/include/IMediaRecorder.h b/media/libmedia/include/media/IMediaRecorder.h
similarity index 100%
rename from media/libmedia/include/IMediaRecorder.h
rename to media/libmedia/include/media/IMediaRecorder.h
diff --git a/media/libmedia/include/IMediaRecorderClient.h b/media/libmedia/include/media/IMediaRecorderClient.h
similarity index 100%
rename from media/libmedia/include/IMediaRecorderClient.h
rename to media/libmedia/include/media/IMediaRecorderClient.h
diff --git a/media/libmedia/include/IMediaSource.h b/media/libmedia/include/media/IMediaSource.h
similarity index 100%
rename from media/libmedia/include/IMediaSource.h
rename to media/libmedia/include/media/IMediaSource.h
diff --git a/media/libmedia/include/IOMX.h b/media/libmedia/include/media/IOMX.h
similarity index 100%
rename from media/libmedia/include/IOMX.h
rename to media/libmedia/include/media/IOMX.h
diff --git a/media/libmedia/include/IRemoteDisplay.h b/media/libmedia/include/media/IRemoteDisplay.h
similarity index 100%
rename from media/libmedia/include/IRemoteDisplay.h
rename to media/libmedia/include/media/IRemoteDisplay.h
diff --git a/media/libmedia/include/IRemoteDisplayClient.h b/media/libmedia/include/media/IRemoteDisplayClient.h
similarity index 100%
rename from media/libmedia/include/IRemoteDisplayClient.h
rename to media/libmedia/include/media/IRemoteDisplayClient.h
diff --git a/media/libmedia/include/IResourceManagerClient.h b/media/libmedia/include/media/IResourceManagerClient.h
similarity index 100%
rename from media/libmedia/include/IResourceManagerClient.h
rename to media/libmedia/include/media/IResourceManagerClient.h
diff --git a/media/libmedia/include/IResourceManagerService.h b/media/libmedia/include/media/IResourceManagerService.h
similarity index 100%
rename from media/libmedia/include/IResourceManagerService.h
rename to media/libmedia/include/media/IResourceManagerService.h
diff --git a/media/libmedia/include/IStreamSource.h b/media/libmedia/include/media/IStreamSource.h
similarity index 100%
rename from media/libmedia/include/IStreamSource.h
rename to media/libmedia/include/media/IStreamSource.h
diff --git a/media/libmedia/include/JetPlayer.h b/media/libmedia/include/media/JetPlayer.h
similarity index 100%
rename from media/libmedia/include/JetPlayer.h
rename to media/libmedia/include/media/JetPlayer.h
diff --git a/media/libmedia/include/LinearMap.h b/media/libmedia/include/media/LinearMap.h
similarity index 100%
rename from media/libmedia/include/LinearMap.h
rename to media/libmedia/include/media/LinearMap.h
diff --git a/media/libmedia/include/MediaCodecBuffer.h b/media/libmedia/include/media/MediaCodecBuffer.h
similarity index 100%
rename from media/libmedia/include/MediaCodecBuffer.h
rename to media/libmedia/include/media/MediaCodecBuffer.h
diff --git a/media/libmedia/include/MediaCodecInfo.h b/media/libmedia/include/media/MediaCodecInfo.h
similarity index 100%
rename from media/libmedia/include/MediaCodecInfo.h
rename to media/libmedia/include/media/MediaCodecInfo.h
diff --git a/media/libmedia/include/MediaDefs.h b/media/libmedia/include/media/MediaDefs.h
similarity index 100%
rename from media/libmedia/include/MediaDefs.h
rename to media/libmedia/include/media/MediaDefs.h
diff --git a/media/libmedia/include/MediaMetadataRetrieverInterface.h b/media/libmedia/include/media/MediaMetadataRetrieverInterface.h
similarity index 100%
rename from media/libmedia/include/MediaMetadataRetrieverInterface.h
rename to media/libmedia/include/media/MediaMetadataRetrieverInterface.h
diff --git a/media/libmedia/include/MediaProfiles.h b/media/libmedia/include/media/MediaProfiles.h
similarity index 100%
rename from media/libmedia/include/MediaProfiles.h
rename to media/libmedia/include/media/MediaProfiles.h
diff --git a/media/libmedia/include/MediaRecorderBase.h b/media/libmedia/include/media/MediaRecorderBase.h
similarity index 100%
rename from media/libmedia/include/MediaRecorderBase.h
rename to media/libmedia/include/media/MediaRecorderBase.h
diff --git a/media/libmedia/include/MediaResource.h b/media/libmedia/include/media/MediaResource.h
similarity index 100%
rename from media/libmedia/include/MediaResource.h
rename to media/libmedia/include/media/MediaResource.h
diff --git a/media/libmedia/include/MediaResourcePolicy.h b/media/libmedia/include/media/MediaResourcePolicy.h
similarity index 100%
rename from media/libmedia/include/MediaResourcePolicy.h
rename to media/libmedia/include/media/MediaResourcePolicy.h
diff --git a/media/libmedia/include/MemoryLeakTrackUtil.h b/media/libmedia/include/media/MemoryLeakTrackUtil.h
similarity index 100%
rename from media/libmedia/include/MemoryLeakTrackUtil.h
rename to media/libmedia/include/media/MemoryLeakTrackUtil.h
diff --git a/media/libmedia/include/Metadata.h b/media/libmedia/include/media/Metadata.h
similarity index 100%
rename from media/libmedia/include/Metadata.h
rename to media/libmedia/include/media/Metadata.h
diff --git a/media/libmedia/include/MidiDeviceInfo.h b/media/libmedia/include/media/MidiDeviceInfo.h
similarity index 100%
rename from media/libmedia/include/MidiDeviceInfo.h
rename to media/libmedia/include/media/MidiDeviceInfo.h
diff --git a/media/libmedia/include/MidiIoWrapper.h b/media/libmedia/include/media/MidiIoWrapper.h
similarity index 100%
rename from media/libmedia/include/MidiIoWrapper.h
rename to media/libmedia/include/media/MidiIoWrapper.h
diff --git a/media/libmedia/include/Modulo.h b/media/libmedia/include/media/Modulo.h
similarity index 100%
rename from media/libmedia/include/Modulo.h
rename to media/libmedia/include/media/Modulo.h
diff --git a/media/libmedia/include/OMXBuffer.h b/media/libmedia/include/media/OMXBuffer.h
similarity index 100%
rename from media/libmedia/include/OMXBuffer.h
rename to media/libmedia/include/media/OMXBuffer.h
diff --git a/media/libmedia/include/OMXFenceParcelable.h b/media/libmedia/include/media/OMXFenceParcelable.h
similarity index 100%
rename from media/libmedia/include/OMXFenceParcelable.h
rename to media/libmedia/include/media/OMXFenceParcelable.h
diff --git a/media/libmedia/include/PluginLoader.h b/media/libmedia/include/media/PluginLoader.h
similarity index 100%
rename from media/libmedia/include/PluginLoader.h
rename to media/libmedia/include/media/PluginLoader.h
diff --git a/media/libmedia/include/RecordBufferConverter.h b/media/libmedia/include/media/RecordBufferConverter.h
similarity index 100%
rename from media/libmedia/include/RecordBufferConverter.h
rename to media/libmedia/include/media/RecordBufferConverter.h
diff --git a/media/libmedia/include/RingBuffer.h b/media/libmedia/include/media/RingBuffer.h
similarity index 100%
rename from media/libmedia/include/RingBuffer.h
rename to media/libmedia/include/media/RingBuffer.h
diff --git a/media/libmedia/include/SharedLibrary.h b/media/libmedia/include/media/SharedLibrary.h
similarity index 100%
rename from media/libmedia/include/SharedLibrary.h
rename to media/libmedia/include/media/SharedLibrary.h
diff --git a/media/libmedia/include/SingleStateQueue.h b/media/libmedia/include/media/SingleStateQueue.h
similarity index 100%
rename from media/libmedia/include/SingleStateQueue.h
rename to media/libmedia/include/media/SingleStateQueue.h
diff --git a/media/libmedia/include/StringArray.h b/media/libmedia/include/media/StringArray.h
similarity index 100%
rename from media/libmedia/include/StringArray.h
rename to media/libmedia/include/media/StringArray.h
diff --git a/media/libmedia/include/TypeConverter.h b/media/libmedia/include/media/TypeConverter.h
similarity index 99%
rename from media/libmedia/include/TypeConverter.h
rename to media/libmedia/include/media/TypeConverter.h
index e262eef..cb8a307 100644
--- a/media/libmedia/include/TypeConverter.h
+++ b/media/libmedia/include/media/TypeConverter.h
@@ -25,8 +25,8 @@
#include <utils/Vector.h>
#include <utils/SortedVector.h>
+#include <media/AudioParameter.h>
#include "convert.h"
-#include "AudioParameter.h"
namespace android {
diff --git a/media/libmedia/include/Visualizer.h b/media/libmedia/include/media/Visualizer.h
similarity index 100%
rename from media/libmedia/include/Visualizer.h
rename to media/libmedia/include/media/Visualizer.h
diff --git a/media/libmedia/include/convert.h b/media/libmedia/include/media/convert.h
similarity index 100%
rename from media/libmedia/include/convert.h
rename to media/libmedia/include/media/convert.h
diff --git a/media/libmedia/include/mediametadataretriever.h b/media/libmedia/include/media/mediametadataretriever.h
similarity index 100%
rename from media/libmedia/include/mediametadataretriever.h
rename to media/libmedia/include/media/mediametadataretriever.h
diff --git a/media/libmedia/include/mediaplayer.h b/media/libmedia/include/media/mediaplayer.h
similarity index 100%
rename from media/libmedia/include/mediaplayer.h
rename to media/libmedia/include/media/mediaplayer.h
diff --git a/media/libmedia/include/mediarecorder.h b/media/libmedia/include/media/mediarecorder.h
similarity index 100%
rename from media/libmedia/include/mediarecorder.h
rename to media/libmedia/include/media/mediarecorder.h
diff --git a/media/libmedia/include/mediascanner.h b/media/libmedia/include/media/mediascanner.h
similarity index 100%
rename from media/libmedia/include/mediascanner.h
rename to media/libmedia/include/media/mediascanner.h