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

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

Merge "AudioFlinger: Move small files to afutils" into udc-dev-plus-aosp

parents 9e263d0e 779a56ff

services/audioflinger/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ cc_library_shared { 
        "MelReporter.cpp",

        "PatchCommandThread.cpp",

        "PatchPanel.cpp",

        "PropertyUtils.cpp",

        "Threads.cpp",

        "Tracks.cpp",

    ],

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 


#include "AudioFlinger.h"

#include "EffectConfiguration.h"

#include "PropertyUtils.h"

#include <afutils/PropertyUtils.h>



#include <media/AudioResamplerPublic.h>

services/audioflinger/AudioFlinger.h

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

#include <mediautils/ThreadSnapshot.h>



#include <afutils/AllocatorFactory.h>

#include <afutils/AudioWatchdog.h>

#include <afutils/NBAIO_Tee.h>
@@ -104,7 +105,6 @@ 
#include <fastpath/FastMixer.h>

#include <media/nbaio/NBAIO.h>



#include "AllocatorFactory.h"

#include <android/os/IPowerManager.h>



#include <media/nblog/NBLog.h>

services/audioflinger/afutils/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -32,18 +32,21 @@ cc_library { 


    defaults: [

        "audioflinger_utils_flags_defaults",

        "latest_android_media_audio_common_types_cpp_shared", // PropertyUtils.cpp

    ],



    srcs: [

        "AudioWatchdog.cpp",

        "BufLog.cpp",

        "NBAIO_Tee.cpp",

        "PropertyUtils.cpp",

        "TypedLogger.cpp",

    ],



    shared_libs: [

        "libaudioutils",

        "libbase",

        "libcutils", // property_get_int32

        "liblog",

        "libnbaio",

        "libnblog",
@@ -54,6 +57,10 @@ cc_library { 
        "libsndfile",

    ],



    header_libs: [

        "libaaudio_headers",  // PropertyUtils.cpp

    ],



    include_dirs: [

        "frameworks/av/services/audioflinger",  // for configuration

    ],