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

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

Merge "AudioFlinger: Move small files to afutils" am: 74098ccd am: e037cbb7 

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



Change-Id: Icd8b1590e99053ea5e1cecb5a1045e6d6f3a9078
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d005f29 e037cbb7

services/audioflinger/Android.bp

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

        "Effects.cpp",

        "PatchPanel.cpp",

        "PropertyUtils.cpp",

        "Threads.cpp",

        "Tracks.cpp",

    ],

services/audioflinger/AudioFlinger.cpp

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



#include "AudioFlinger.h"

#include "PropertyUtils.h"

#include <afutils/PropertyUtils.h>



#include <media/AudioResamplerPublic.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

    ],