Replace cutils/log.h with either android/log.h or log/log.h
Test: compile
Bug: 31289077
Change-Id: I795a76f978d2213737f1fa908da789c543219b75
diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp
index 4f8b413..43624a0 100644
--- a/services/audioflinger/AudioResampler.cpp
+++ b/services/audioflinger/AudioResampler.cpp
@@ -17,11 +17,14 @@
#define LOG_TAG "AudioResampler"
//#define LOG_NDEBUG 0
+#include <pthread.h>
#include <stdint.h>
#include <stdlib.h>
#include <sys/types.h>
-#include <cutils/log.h>
+
+#include <android/log.h>
#include <cutils/properties.h>
+
#include <audio_utils/primitives.h>
#include "AudioResampler.h"
#include "AudioResamplerSinc.h"
diff --git a/services/audioflinger/AudioResamplerCubic.cpp b/services/audioflinger/AudioResamplerCubic.cpp
index 9c3c7cb..d27dce7 100644
--- a/services/audioflinger/AudioResamplerCubic.cpp
+++ b/services/audioflinger/AudioResamplerCubic.cpp
@@ -19,7 +19,7 @@
#include <stdint.h>
#include <string.h>
#include <sys/types.h>
-#include <cutils/log.h>
+#include <android/log.h>
#include "AudioResampler.h"
#include "AudioResamplerCubic.h"
diff --git a/services/audioflinger/AudioResamplerCubic.h b/services/audioflinger/AudioResamplerCubic.h
index 4b45b0b..f218fd9 100644
--- a/services/audioflinger/AudioResamplerCubic.h
+++ b/services/audioflinger/AudioResamplerCubic.h
@@ -19,7 +19,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <cutils/log.h>
+#include <android/log.h>
#include "AudioResampler.h"
diff --git a/services/audioflinger/AudioResamplerDyn.h b/services/audioflinger/AudioResamplerDyn.h
index 3b1c381..f8b8fa1 100644
--- a/services/audioflinger/AudioResamplerDyn.h
+++ b/services/audioflinger/AudioResamplerDyn.h
@@ -19,7 +19,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <cutils/log.h>
+#include <android/log.h>
#include "AudioResampler.h"
diff --git a/services/audioflinger/AudioResamplerSinc.h b/services/audioflinger/AudioResamplerSinc.h
index 0fbeac8..df8b45a 100644
--- a/services/audioflinger/AudioResamplerSinc.h
+++ b/services/audioflinger/AudioResamplerSinc.h
@@ -19,7 +19,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <cutils/log.h>
+#include <android/log.h>
#include "AudioResampler.h"
diff --git a/services/audioflinger/tests/resampler_tests.cpp b/services/audioflinger/tests/resampler_tests.cpp
index 9e375db..406b960 100644
--- a/services/audioflinger/tests/resampler_tests.cpp
+++ b/services/audioflinger/tests/resampler_tests.cpp
@@ -17,22 +17,25 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "audioflinger_resampler_tests"
-#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#include <fcntl.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <errno.h>
#include <time.h>
-#include <math.h>
-#include <vector>
-#include <utility>
+#include <unistd.h>
+
#include <iostream>
-#include <cutils/log.h>
+#include <utility>
+#include <vector>
+
+#include <android/log.h>
#include <gtest/gtest.h>
#include <media/AudioBufferProvider.h>
+
#include "AudioResampler.h"
#include "test_utils.h"