From 9f3c02d15167b98b9208687e7e30e07149efbf2d Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Mon, 12 Aug 2019 11:36:05 -0700 Subject: [PATCH] Move ExtendedAudioBufferProvider and SingleStateQueue Move ExtendedAudioBufferProvider.h to libaudioclient. This is a more appropriate location because EABP extends AudioBufferProvider. Move SingleStateQueue.h to libnbaio_mono. This is a more appropriate location because SSQ is a non-blocking queue. This allows to remove the dependency of libnbaio on libmedia which is a good thing because libnbaio provides more low-level abstractions than libmedia. Also, replace a dependency of libnbaio on libbinder with a dependency on libaudiohal header library. Test: make Change-Id: Ie48b523790cd8230695ec2e4710e50981b616289 --- include/media/ExtendedAudioBufferProvider.h | 2 +- include/media/SingleStateQueue.h | 1 - include/media/nbaio/SingleStateQueue.h | 1 + include/private/media/AudioTrackShared.h | 2 +- .../media/ExtendedAudioBufferProvider.h | 0 media/libaudiohal/Android.bp | 6 ++++++ media/libnbaio/Android.bp | 21 +++++++------------ .../include_mono/media/nbaio/MonoPipe.h | 2 +- .../media/nbaio}/SingleStateQueue.h | 0 9 files changed, 17 insertions(+), 18 deletions(-) delete mode 120000 include/media/SingleStateQueue.h create mode 120000 include/media/nbaio/SingleStateQueue.h rename media/{libmedia => libaudioclient}/include/media/ExtendedAudioBufferProvider.h (100%) rename media/{libmedia/include/media => libnbaio/include_mono/media/nbaio}/SingleStateQueue.h (100%) diff --git a/include/media/ExtendedAudioBufferProvider.h b/include/media/ExtendedAudioBufferProvider.h index d653cc34e2..99d3c13b1d 120000 --- a/include/media/ExtendedAudioBufferProvider.h +++ b/include/media/ExtendedAudioBufferProvider.h @@ -1 +1 @@ -../../media/libmedia/include/media/ExtendedAudioBufferProvider.h \ No newline at end of file +../../media/libaudioclient/include/media/ExtendedAudioBufferProvider.h \ No newline at end of file diff --git a/include/media/SingleStateQueue.h b/include/media/SingleStateQueue.h deleted file mode 120000 index 619f6ee8da..0000000000 --- a/include/media/SingleStateQueue.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/SingleStateQueue.h \ No newline at end of file diff --git a/include/media/nbaio/SingleStateQueue.h b/include/media/nbaio/SingleStateQueue.h new file mode 120000 index 0000000000..d3e05538ff --- /dev/null +++ b/include/media/nbaio/SingleStateQueue.h @@ -0,0 +1 @@ +../../../media/libnbaio/include_mono/media/nbaio/SingleStateQueue.h \ No newline at end of file diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index ca119d5da1..8a2e96c766 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include namespace android { diff --git a/media/libmedia/include/media/ExtendedAudioBufferProvider.h b/media/libaudioclient/include/media/ExtendedAudioBufferProvider.h similarity index 100% rename from media/libmedia/include/media/ExtendedAudioBufferProvider.h rename to media/libaudioclient/include/media/ExtendedAudioBufferProvider.h diff --git a/media/libaudiohal/Android.bp b/media/libaudiohal/Android.bp index 3a5df27971..1080f9cb5b 100644 --- a/media/libaudiohal/Android.bp +++ b/media/libaudiohal/Android.bp @@ -53,4 +53,10 @@ cc_library_headers { name: "libaudiohal_headers", export_include_dirs: ["include"], + + // This is needed because the stream interface includes media/MicrophoneInfo.h + // which is not in any library but has a dependency on headers from libbinder. + header_libs: ["libbinder_headers"], + + export_header_lib_headers: ["libbinder_headers"], } diff --git a/media/libnbaio/Android.bp b/media/libnbaio/Android.bp index 6345742be7..04ddcfffeb 100644 --- a/media/libnbaio/Android.bp +++ b/media/libnbaio/Android.bp @@ -8,15 +8,14 @@ cc_defaults { header_libs: [ "libaudioclient_headers", "libaudio_system_headers", - "libmedia_headers", ], export_header_lib_headers: [ "libaudioclient_headers", - "libmedia_headers", ], shared_libs: [ "libaudioutils", + "libcutils", "liblog", "libutils", ], @@ -25,6 +24,11 @@ cc_defaults { ], export_include_dirs: ["include_mono"], + + cflags: [ + "-Werror", + "-Wall", + ], } // libnbaio_mono is the part of libnbaio that is available for vendors to use. Vendor modules can't @@ -55,18 +59,7 @@ cc_library_shared { // ], // static_libs: ["libsndfile"], - shared_libs: [ - "libaudioutils", - "libbinder", - "libcutils", - "liblog", - "libutils", - ], - - cflags: [ - "-Werror", - "-Wall", - ], + header_libs: ["libaudiohal_headers"], export_include_dirs: ["include"], } diff --git a/media/libnbaio/include_mono/media/nbaio/MonoPipe.h b/media/libnbaio/include_mono/media/nbaio/MonoPipe.h index c51d0feb56..926d84a43c 100644 --- a/media/libnbaio/include_mono/media/nbaio/MonoPipe.h +++ b/media/libnbaio/include_mono/media/nbaio/MonoPipe.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include namespace android { diff --git a/media/libmedia/include/media/SingleStateQueue.h b/media/libnbaio/include_mono/media/nbaio/SingleStateQueue.h similarity index 100% rename from media/libmedia/include/media/SingleStateQueue.h rename to media/libnbaio/include_mono/media/nbaio/SingleStateQueue.h