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/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;
}