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

Commit 71bf335f authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblog: use log/log.h for ALOG macros" 

am: 06d8feef

Change-Id: Ib5b1d8dbd98957bb409bece5be84dfb10f4b23fc
parents 6afe508b 06d8feef

media/libeffects/downmix/EffectDownmix.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <stdlib.h>

#include <stdlib.h>

#include <string.h>

#include <string.h>





#include <android/log.h>

#include <log/log.h>





#include "EffectDownmix.h"

#include "EffectDownmix.h"

media/libeffects/factory/EffectsFactory.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <string.h>

#include <string.h>

#include <unistd.h>

#include <unistd.h>





#include <android/log.h>

#include <cutils/config_utils.h>

#include <cutils/config_utils.h>

#include <cutils/misc.h>

#include <cutils/misc.h>

#include <cutils/properties.h>

#include <cutils/properties.h>

#include <log/log.h>





#include <audio_effects/audio_effects_conf.h>

#include <audio_effects/audio_effects_conf.h>

media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
#endif

#endif

//#define LOG_NDEBUG 0

//#define LOG_NDEBUG 0





#include <android/log.h>

#include <log/log.h>





namespace le_fx {

namespace le_fx {

media/libeffects/loudness/dsp/core/interpolator_base-inl.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
#endif

#endif

//#define LOG_NDEBUG 0

//#define LOG_NDEBUG 0





#include <android/log.h>

#include <log/log.h>





#include "dsp/core/basic.h"

#include "dsp/core/basic.h"

media/libstagefright/codecs/amrnb/dec/src/a_refl.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ terms listed above has been obtained from the copyright holder. 
; INCLUDES

; INCLUDES

----------------------------------------------------------------------------*/

----------------------------------------------------------------------------*/

#define LOG_TAG "a_refl"

#define LOG_TAG "a_refl"

#include <android/log.h>

#include <log/log.h>





#include "a_refl.h"

#include "a_refl.h"

#include "typedef.h"

#include "typedef.h"