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

Commit 5bc1a9aa authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "Split audio effects headers"

parents aadc29b9 9fe94012

include/media/Visualizer.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define ANDROID_MEDIA_VISUALIZER_H



#include <media/AudioEffect.h>

#include <audio_effects/effect_visualizer.h>

#include <system/audio_effects/effect_visualizer.h>

#include <utils/Thread.h>



/**

media/libmedia/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ LOCAL_C_INCLUDES := \ 
    $(TOP)/frameworks/av/include/media/ \

    $(TOP)/frameworks/av/media/libstagefright \

    $(TOP)/frameworks/av/media/libmedia/aidl \

    $(call include-path-for, audio-effects) \

    $(call include-path-for, audio-utils)



LOCAL_EXPORT_C_INCLUDE_DIRS := \

services/audioflinger/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ LOCAL_SRC_FILES:= \ 
LOCAL_C_INCLUDES := \

    $(TOPDIR)frameworks/av/services/audiopolicy \

    $(TOPDIR)external/sonic \

    $(call include-path-for, audio-effects) \

    $(call include-path-for, audio-utils)



LOCAL_SHARED_LIBRARIES := \

services/audioflinger/AudioFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ 


#include <media/AudioResamplerPublic.h>



#include <audio_effects/effect_visualizer.h>

#include <audio_effects/effect_ns.h>

#include <audio_effects/effect_aec.h>

#include <system/audio_effects/effect_visualizer.h>

#include <system/audio_effects/effect_ns.h>

#include <system/audio_effects/effect_aec.h>



#include <audio_utils/primitives.h>

services/audioflinger/BufferProviders.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
#define LOG_TAG "BufferProvider"

//#define LOG_NDEBUG 0



#include <audio_effects/effect_downmix.h>

#include <audio_utils/primitives.h>

#include <audio_utils/format.h>

#include <media/audiohal/EffectHalInterface.h>

#include <media/audiohal/EffectsFactoryHalInterface.h>

#include <media/AudioResamplerPublic.h>

#include <system/audio_effects/effect_downmix.h>



#include <utils/Log.h>