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

Commit c6d07e82 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: 59cfe7de

Change-Id: Ic961061fc8b320bc6e8525005ade7423d09ad79b
parents 93b375b7 59cfe7de

media/libeffects/loudness/EffectLoudnessEnhancer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ 


#include <assert.h>

#include <math.h>

#include <new>

#include <stdlib.h>

#include <string.h>

#include <time.h>



#include <android/log.h>

#include <new>



#include <log/log.h>



#include <audio_effects/effect_loudnessenhancer.h>

#include "dsp/core/dynamic_range_compression.h"

media/libeffects/testlibs/EffectEqualizer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ 
#include <assert.h>

#include <stdlib.h>

#include <string.h>



#include <new>



#include <android/log.h>

#include <log/log.h>



#include "AudioEqualizer.h"

#include "AudioBiquadFilter.h"

media/libeffects/testlibs/EffectReverb.c

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

#include <string.h>



#include <android/log.h>

#include <log/log.h>



#include "EffectReverb.h"

#include "EffectsMath.h"

media/libstagefright/foundation/AMessage.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 


#include "AMessage.h"



#include <android/log.h>

#include <binder/Parcel.h>

#include <log/log.h>



#include "AAtomizer.h"

#include "ABuffer.h"

services/audioflinger/tests/resampler_tests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 
#include <utility>

#include <vector>



#include <android/log.h>

#include <gtest/gtest.h>

#include <log/log.h>

#include <media/AudioBufferProvider.h>



#include "AudioResampler.h"