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

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

Merge "Move audio_effects_conf.h to system/audio_effects"

parents 65fb6567 c2f710f8

media/libeffects/factory/EffectsFactory.c

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

#include <cutils/config_utils.h>

#include <cutils/properties.h>

#include <audio_effects/audio_effects_conf.h>

#include <system/audio_effects/audio_effects_conf.h>



static list_elem_t *gEffectList; // list of effect_entry_t: all currently created effects

static list_elem_t *gLibraryList; // list of lib_entry_t: all currently loaded libraries

services/audiopolicy/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ endif 


LOCAL_C_INCLUDES := \

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

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

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

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

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

services/audiopolicy/service/AudioPolicyEffects.cpp

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

#include <media/AudioEffect.h>

#include <system/audio.h>

#include <audio_effects/audio_effects_conf.h>

#include <system/audio_effects/audio_effects_conf.h>

#include <utils/Vector.h>

#include <utils/SortedVector.h>

#include <cutils/config_utils.h>