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

Commit d6f07e76 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: move utilities files to library" am: 792f4484 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2605473



Change-Id: Idc9a0b8983f22e668da6332fac8051a4163f1843
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e89e7fd 792f4484

services/audioflinger/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -146,8 +146,6 @@ cc_library_shared { 
        "AudioFlinger.cpp",

        "AudioHwDevice.cpp",

        "AudioStreamOut.cpp",

        "AudioWatchdog.cpp",

        "BufLog.cpp",

        "DeviceEffectManager.cpp",

        "Effects.cpp",

        "FastCapture.cpp",
@@ -159,14 +157,12 @@ cc_library_shared { 
        "FastThread.cpp",

        "FastThreadDumpState.cpp",

        "FastThreadState.cpp",

        "NBAIO_Tee.cpp",

        "PatchPanel.cpp",

        "PropertyUtils.cpp",

        "SpdifStreamOut.cpp",

        "StateQueue.cpp",

        "Threads.cpp",

        "Tracks.cpp",

        "TypedLogger.cpp",

    ],



    include_dirs: [
@@ -181,6 +177,7 @@ cc_library_shared { 
        "effect-aidl-cpp",

        "libaudioclient_aidl_conversion",

        "libaudioflinger_timing",

        "libaudioflinger_utils",

        "libaudiofoundation",

        "libaudiohal",

        "libaudioprocessing",
@@ -208,7 +205,6 @@ cc_library_shared { 


    static_libs: [

        "libcpustats",

        "libsndfile",

        "libpermission",

    ],

services/audioflinger/AudioFlinger.cpp

+2 −4
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
#include <audiomanager/AudioManager.h>



#include "AudioFlinger.h"

#include "NBAIO_Tee.h"

#include "PropertyUtils.h"



#include <media/AudioResamplerPublic.h>
@@ -86,9 +85,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
@@ -78,6 +78,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>
@@ -91,11 +94,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"

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 {