Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a703d668 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "AudioFlinger: move utilities files to library"

parents f74e4c2c 2c20bd8f

services/audioflinger/Android.bp

+2 −6
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ cc_defaults { 
        "libaudioclient_aidl_conversion",

        "libactivitymanager_aidl",

        "libaudioflinger_timing",

        "libaudioflinger_utils",

        "libaudiofoundation",

        "libaudiohal",

        "libaudioprocessing",
@@ -158,6 +159,7 @@ cc_defaults { 
        "libaudiomanager",

        "libmediametrics",

        "libmediautils",

        "libnbaio",

        "libnblog",

        "libpermission",

        "libpowermanager",
@@ -172,7 +174,6 @@ cc_defaults { 
    static_libs: [

        "libmedialogservice",

        "libaudiospdif",

        "libnbaio",

    ],

}
@@ -191,8 +192,6 @@ cc_library { 
        "AudioFlinger.cpp",

        "AudioHwDevice.cpp",

        "AudioStreamOut.cpp",

        "AudioWatchdog.cpp",

        "BufLog.cpp",

        "DeviceEffectManager.cpp",

        "Effects.cpp",

        "FastCapture.cpp",
@@ -205,7 +204,6 @@ cc_library { 
        "FastThreadDumpState.cpp",

        "FastThreadState.cpp",

        "MelReporter.cpp",

        "NBAIO_Tee.cpp",

        "PatchCommandThread.cpp",

        "PatchPanel.cpp",

        "PropertyUtils.cpp",
@@ -213,7 +211,6 @@ cc_library { 
        "StateQueue.cpp",

        "Threads.cpp",

        "Tracks.cpp",

        "TypedLogger.cpp",

    ],



    include_dirs: [
@@ -223,7 +220,6 @@ cc_library { 


    static_libs: [

        "libcpustats",

        "libsndfile",

        "libpermission",

    ],

services/audioflinger/AudioFlinger.cpp

+2 −4
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 


#include "AudioFlinger.h"

#include "EffectConfiguration.h"

#include "NBAIO_Tee.h"

#include "PropertyUtils.h"



#include <media/AudioResamplerPublic.h>
@@ -87,9 +86,8 @@ 
#include <private/android_filesystem_config.h>



//#define BUFLOG_NDEBUG 0

#include <BufLog.h>



#include "TypedLogger.h"

#include <afutils/BufLog.h>

#include <afutils/TypedLogger.h>



// ----------------------------------------------------------------------------

services/audioflinger/AudioFlinger.h

+3 −2
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ 
#include <mediautils/Synchronization.h>

#include <mediautils/ThreadSnapshot.h>



#include <afutils/AudioWatchdog.h>

#include <afutils/NBAIO_Tee.h>



#include <audio_utils/clock.h>

#include <audio_utils/FdToString.h>

#include <audio_utils/LinearMap.h>
@@ -95,11 +98,9 @@ 
#include "FastCapture.h"

#include "FastMixer.h"

#include <media/nbaio/NBAIO.h>

#include "AudioWatchdog.h"

#include "AudioStreamOut.h"

#include "SpdifStreamOut.h"

#include "AudioHwDevice.h"

#include "NBAIO_Tee.h"

#include "ThreadMetrics.h"

#include "TrackMetrics.h"

#include "AllocatorFactory.h"

services/audioflinger/FastMixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include <cutils/bitops.h>

#include <media/AudioMixer.h>

#include "FastMixer.h"

#include "TypedLogger.h"

#include <afutils/TypedLogger.h>



namespace android {

services/audioflinger/FastMixer.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "StateQueue.h"

#include "FastMixerState.h"

#include "FastMixerDumpState.h"

#include "NBAIO_Tee.h"

#include <afutils/NBAIO_Tee.h>



namespace android {