libaudioprocessing: Trivial dependency cleanups

- Remove unused dependencies on libnbaio and libnblog;

- Move dependencies on libaudiohal and libsonic to libaudioprocessing
  as AudioMixer implementation does not use them.

Test: make
Merged-In: I258a450725bdacb4fcf437b6f86582d51d40e622
Change-Id: I258a450725bdacb4fcf437b6f86582d51d40e622

media/libaudioclient/include/media/AudioMixer.h

@@ -43,10 +43,6 @@
 
 namespace android {
 
-namespace NBLog {
-class Writer;
-}   // namespace NBLog
-
 // ----------------------------------------------------------------------------
 
 class AudioMixer
@@ -188,10 +184,6 @@ public:
         return ss.str();
     }
 
-    void        setNBLogWriter(NBLog::Writer *logWriter) {
-        mNBLogWriter = logWriter;
-    }
-
     static inline bool isValidFormat(audio_format_t format) {
         switch (format) {
         case AUDIO_FORMAT_PCM_8_BIT:
@@ -491,8 +483,6 @@ private:
     const uint32_t mSampleRate;
     const size_t mFrameCount;
 
-    NBLog::Writer *mNBLogWriter = nullptr;   // associated NBLog::Writer
-
     process_hook_t mHook = &AudioMixer::process__nop;   // one of process__*, never nullptr
 
     // the size of the type (int32_t) should be the largest of all types supported

media/libaudioprocessing/Android.bp

@@ -4,13 +4,9 @@ cc_defaults {
     export_include_dirs: ["include"],
 
     shared_libs: [
-        "libaudiohal",
         "libaudioutils",
         "libcutils",
         "liblog",
-        "libnbaio",
-        "libnblog",
-        "libsonic",
         "libutils",
         "libvibrator",
     ],
@@ -36,6 +32,12 @@ cc_library_shared {
         "BufferProviders.cpp",
         "RecordBufferConverter.cpp",
     ],
+
+    shared_libs: [
+        "libaudiohal",
+        "libsonic",
+    ],
+
     whole_static_libs: ["libaudioprocessing_arm"],
 }
 

services/audioflinger/FastMixer.cpp

@@ -105,13 +105,8 @@ const FastThreadState *FastMixer::poll()
     return mSQ.poll();
 }
 
-void FastMixer::setNBLogWriter(NBLog::Writer *logWriter)
+void FastMixer::setNBLogWriter(NBLog::Writer *logWriter __unused)
 {
-    // FIXME If mMixer is set or changed prior to this, we don't inform correctly.
-    //       Should cache logWriter and re-apply it at the assignment to mMixer.
-    if (mMixer != NULL) {
-        mMixer->setNBLogWriter(logWriter);
-    }
 }
 
 void FastMixer::onIdle()

services/audioflinger/FastThread.cpp

@@ -124,7 +124,7 @@ bool FastThread::threadLoop()
             mDumpState = next->mDumpState != NULL ? next->mDumpState : mDummyDumpState;
             tlNBLogWriter = next->mNBLogWriter != NULL ?
                     next->mNBLogWriter : mDummyNBLogWriter.get();
-            setNBLogWriter(tlNBLogWriter); // FastMixer informs its AudioMixer, FastCapture ignores
+            setNBLogWriter(tlNBLogWriter); // This is used for debugging only
 
             // We want to always have a valid reference to the previous (non-idle) state.
             // However, the state queue only guarantees access to current and previous states.