Replace cutils/log.h with either android/log.h or log/log.h
Test: compile
Bug: 31289077
Change-Id: I795a76f978d2213737f1fa908da789c543219b75
diff --git a/media/libeffects/downmix/EffectDownmix.c b/media/libeffects/downmix/EffectDownmix.c
index 9823c55..fff20e7 100644
--- a/media/libeffects/downmix/EffectDownmix.c
+++ b/media/libeffects/downmix/EffectDownmix.c
@@ -16,11 +16,14 @@
#define LOG_TAG "EffectDownmix"
//#define LOG_NDEBUG 0
-#include <log/log.h>
+
#include <inttypes.h>
+#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <stdbool.h>
+
+#include <android/log.h>
+
#include "EffectDownmix.h"
// Do not submit with DOWNMIX_TEST_CHANNEL_INDEX defined, strictly for testing
diff --git a/media/libeffects/factory/EffectsFactory.c b/media/libeffects/factory/EffectsFactory.c
index db7865a..2d2596d 100644
--- a/media/libeffects/factory/EffectsFactory.c
+++ b/media/libeffects/factory/EffectsFactory.c
@@ -18,13 +18,17 @@
//#define LOG_NDEBUG 0
#include "EffectsFactory.h"
-#include <string.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <cutils/misc.h>
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <android/log.h>
#include <cutils/config_utils.h>
+#include <cutils/misc.h>
#include <cutils/properties.h>
+
#include <audio_effects/audio_effects_conf.h>
static list_elem_t *gEffectList; // list of effect_entry_t: all currently created effects
diff --git a/media/libeffects/factory/EffectsFactory.h b/media/libeffects/factory/EffectsFactory.h
index 518800d..b7936e0 100644
--- a/media/libeffects/factory/EffectsFactory.h
+++ b/media/libeffects/factory/EffectsFactory.h
@@ -17,9 +17,10 @@
#ifndef ANDROID_EFFECTSFACTORY_H_
#define ANDROID_EFFECTSFACTORY_H_
-#include <cutils/log.h>
-#include <pthread.h>
#include <dirent.h>
+#include <pthread.h>
+
+#include <android/log.h>
#include <hardware/audio_effect.h>
#if __cplusplus
diff --git a/media/libeffects/loudness/EffectLoudnessEnhancer.cpp b/media/libeffects/loudness/EffectLoudnessEnhancer.cpp
index a5a1a3f..3c78e95 100644
--- a/media/libeffects/loudness/EffectLoudnessEnhancer.cpp
+++ b/media/libeffects/loudness/EffectLoudnessEnhancer.cpp
@@ -16,13 +16,16 @@
#define LOG_TAG "EffectLE"
//#define LOG_NDEBUG 0
-#include <cutils/log.h>
+
#include <assert.h>
+#include <math.h>
+#include <new>
#include <stdlib.h>
#include <string.h>
-#include <new>
#include <time.h>
-#include <math.h>
+
+#include <android/log.h>
+
#include <audio_effects/effect_loudnessenhancer.h>
#include "dsp/core/dynamic_range_compression.h"
diff --git a/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h b/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h
index da75ceb..4f9f438 100644
--- a/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h
+++ b/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h
@@ -16,13 +16,15 @@
#ifndef LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_INL_H_
#define LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_INL_H_
+#ifndef LOG_TAG
+#define LOG_TAG NULL
+#endif
//#define LOG_NDEBUG 0
-#include <cutils/log.h>
+#include <android/log.h>
namespace le_fx {
-
inline void AdaptiveDynamicRangeCompression::set_knee_threshold(float decibel) {
// Converts to 1og-base
knee_threshold_in_decibel_ = decibel;
diff --git a/media/libeffects/loudness/dsp/core/dynamic_range_compression.cpp b/media/libeffects/loudness/dsp/core/dynamic_range_compression.cpp
index 7bd068e..578f58a 100644
--- a/media/libeffects/loudness/dsp/core/dynamic_range_compression.cpp
+++ b/media/libeffects/loudness/dsp/core/dynamic_range_compression.cpp
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+//#define LOG_NDEBUG 0
#include <cmath>
@@ -22,9 +23,7 @@
#include "dsp/core/interpolation.h"
#include "dsp/core/dynamic_range_compression.h"
-//#define LOG_NDEBUG 0
-#include <cutils/log.h>
-
+#include <android/log.h>
namespace le_fx {
diff --git a/media/libeffects/loudness/dsp/core/dynamic_range_compression.h b/media/libeffects/loudness/dsp/core/dynamic_range_compression.h
index 2821a78..04455c5 100644
--- a/media/libeffects/loudness/dsp/core/dynamic_range_compression.h
+++ b/media/libeffects/loudness/dsp/core/dynamic_range_compression.h
@@ -16,14 +16,14 @@
#ifndef LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_H_
#define LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_H_
+//#define LOG_NDEBUG 0
+
#include "common/core/types.h"
#include "common/core/math.h"
#include "dsp/core/basic.h"
#include "dsp/core/interpolation.h"
-//#define LOG_NDEBUG 0
-#include <cutils/log.h>
-
+#include <android/log.h>
namespace le_fx {
diff --git a/media/libeffects/loudness/dsp/core/interpolator_base-inl.h b/media/libeffects/loudness/dsp/core/interpolator_base-inl.h
index bd08b65..bdb6818 100644
--- a/media/libeffects/loudness/dsp/core/interpolator_base-inl.h
+++ b/media/libeffects/loudness/dsp/core/interpolator_base-inl.h
@@ -16,13 +16,15 @@
#ifndef LE_FX_ENGINE_DSP_CORE_INTERPOLATOR_BASE_INL_H_
#define LE_FX_ENGINE_DSP_CORE_INTERPOLATOR_BASE_INL_H_
+#ifndef LOG_TAG
+#define LOG_TAG NULL
+#endif
+//#define LOG_NDEBUG 0
+
+#include <android/log.h>
#include "dsp/core/basic.h"
-//#define LOG_NDEBUG 0
-#include <cutils/log.h>
-
-
namespace le_fx {
namespace sigmod {
@@ -112,7 +114,7 @@
if (x_data_[n + 1] <= x_data_[n]) {
ALOGE("InterpolatorBase::Initialize: xData are not ordered or "
"contain equal values (X[%d] <= X[%d]) (%.5e <= %.5e)",
- n + 1, n, x_data_[n + 1], x_data_[n]);
+ n + 1, n, x_data_[n + 1], x_data_[n]);
status_ = false;
return false;
}
diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
index d7b5f65..80f783d 100644
--- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
+++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
@@ -25,11 +25,11 @@
#include <stdlib.h>
#include <string.h>
-#include <cutils/log.h>
+#include <log/log.h>
+
#include "EffectBundle.h"
#include "math.h"
-
// effect_handle_t interface implementation for bass boost
extern "C" const struct effect_interface_s gLvmEffectInterface;
diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
index f7dcdda..fc82dd1 100644
--- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
+++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
@@ -25,7 +25,8 @@
#include <stdlib.h>
#include <string.h>
-#include <cutils/log.h>
+#include <log/log.h>
+
#include "EffectReverb.h"
// from Reverb/lib
#include "LVREV.h"
diff --git a/media/libeffects/proxy/EffectProxy.cpp b/media/libeffects/proxy/EffectProxy.cpp
index 7f777e7..0eddc15 100644
--- a/media/libeffects/proxy/EffectProxy.cpp
+++ b/media/libeffects/proxy/EffectProxy.cpp
@@ -17,13 +17,16 @@
#define LOG_TAG "EffectProxy"
//#define LOG_NDEBUG 0
-#include <cutils/log.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <new>
+
#include <EffectProxy.h>
+
+#include <log/log.h>
#include <utils/threads.h>
+
#include <media/EffectsFactoryApi.h>
namespace android {
diff --git a/media/libeffects/testlibs/EffectEqualizer.cpp b/media/libeffects/testlibs/EffectEqualizer.cpp
index 3cb13f2..f5e11a6 100644
--- a/media/libeffects/testlibs/EffectEqualizer.cpp
+++ b/media/libeffects/testlibs/EffectEqualizer.cpp
@@ -18,17 +18,19 @@
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
//
#define LOG_NDEBUG 0
-#include <cutils/log.h>
+
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <new>
+
+#include <android/log.h>
+
#include "AudioEqualizer.h"
#include "AudioBiquadFilter.h"
#include "AudioFormatAdapter.h"
#include <audio_effects/effect_equalizer.h>
-
// effect_handle_t interface implementation for equalizer effect
extern "C" const struct effect_interface_s gEqualizerInterface;
diff --git a/media/libeffects/testlibs/EffectReverb.c b/media/libeffects/testlibs/EffectReverb.c
index f056d19..08bf9ae 100644
--- a/media/libeffects/testlibs/EffectReverb.c
+++ b/media/libeffects/testlibs/EffectReverb.c
@@ -16,10 +16,13 @@
#define LOG_TAG "EffectReverb"
//#define LOG_NDEBUG 0
-#include <cutils/log.h>
+
+#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <stdbool.h>
+
+#include <android/log.h>
+
#include "EffectReverb.h"
#include "EffectsMath.h"
diff --git a/media/libeffects/testlibs/EffectsMath.c b/media/libeffects/testlibs/EffectsMath.c
index 41ec662..efd9e87 100644
--- a/media/libeffects/testlibs/EffectsMath.c
+++ b/media/libeffects/testlibs/EffectsMath.c
@@ -15,9 +15,11 @@
*/
#define LOG_TAG "EFFECTSMATH"
//#define LOG_NDEBUG 0
-#include <cutils/log.h>
+
#include <assert.h>
+#include <android/log.h>
+
#include "EffectsMath.h"
// gLogTab contains pre-calculated values of log2(1 + ai5*2^-1 + ai4*2^-2 + ai3*2^-3 + ai2*2^-4 + ai1*2^-5 + ai0*2^-6)
diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp
index 21fddb1..0eaa3dc 100644
--- a/media/libeffects/visualizer/EffectVisualizer.cpp
+++ b/media/libeffects/visualizer/EffectVisualizer.cpp
@@ -16,17 +16,19 @@
#define LOG_TAG "EffectVisualizer"
//#define LOG_NDEBUG 0
-#include <log/log.h>
+
#include <assert.h>
#include <inttypes.h>
+#include <math.h>
#include <stdlib.h>
#include <string.h>
-#include <new>
#include <time.h>
-#include <math.h>
-#include <audio_effects/effect_visualizer.h>
-#include <cutils/log.h>
+#include <new>
+
+#include <log/log.h>
+
+#include <audio_effects/effect_visualizer.h>
extern "C" {