Merge "Move ExtendedAudioBufferProvider and SingleStateQueue"

am: 2a70a39f4c

Change-Id: I993318e2a9a5bba3aa65ee8319d80bebb537df50

include/media/ExtendedAudioBufferProvider.h

@@ -1 +1 @@
-../../media/libmedia/include/media/ExtendedAudioBufferProvider.h
+../../media/libaudioclient/include/media/ExtendedAudioBufferProvider.h

include/media/SingleStateQueue.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/SingleStateQueue.h

include/media/nbaio/SingleStateQueue.h

@@ -0,0 +1 @@
+../../../media/libnbaio/include_mono/media/nbaio/SingleStateQueue.h

include/private/media/AudioTrackShared.h

@@ -28,7 +28,7 @@
 #include <media/AudioResamplerPublic.h>
 #include <media/AudioTimestamp.h>
 #include <media/Modulo.h>
-#include <media/SingleStateQueue.h>
+#include <media/nbaio/SingleStateQueue.h>
 
 namespace android {
 

media/libaudiohal/Android.bp

@@ -57,4 +57,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"],
 }

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"],
 }

media/libnbaio/include_mono/media/nbaio/MonoPipe.h

@@ -19,7 +19,7 @@
 
 #include <time.h>
 #include <audio_utils/fifo.h>
-#include <media/SingleStateQueue.h>
+#include <media/nbaio/SingleStateQueue.h>
 #include <media/nbaio/NBAIO.h>
 
 namespace android {