commit a8cff157ff0ed02fa7e29438f4889a9933c37768
author Logan Chien <loganchien@google.com> Wed May 09 03:15:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 09 03:15:34 2018 +0000
tree 610804758042582eab193276e316acb37633d01e
parent 384bd00de2efb16eea962367734c2cdebe631e42
parent 24fcfddd43fd60e35923eafa179ea306f7be5809

Merge "Deprecate <cutils/log.h> and <utils/Log.h>"

audio_utils/fifo.cpp

diff --git a/audio_utils/fifo.cpp b/audio_utils/fifo.cpp
index 883a9c0..7ac17da 100644
--- a/audio_utils/fifo.cpp
+++ b/audio_utils/fifo.cpp
@@ -26,7 +26,7 @@
 #include <audio_utils/fifo.h>
 #include <audio_utils/futex.h>
 #include <audio_utils/roundup.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <utils/Errors.h>
 
 audio_utils_fifo_base::audio_utils_fifo_base(uint32_t frameCount,

audio_utils/spdif/AC3FrameScanner.cpp

diff --git a/audio_utils/spdif/AC3FrameScanner.cpp b/audio_utils/spdif/AC3FrameScanner.cpp
index 4055bb0..6ebe9e3 100644
--- a/audio_utils/spdif/AC3FrameScanner.cpp
+++ b/audio_utils/spdif/AC3FrameScanner.cpp
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include <utils/Log.h>
+#include <log/log.h>
 #include <audio_utils/spdif/FrameScanner.h>
 
 #include "AC3FrameScanner.h"

audio_utils/spdif/BitFieldParser.cpp

diff --git a/audio_utils/spdif/BitFieldParser.cpp b/audio_utils/spdif/BitFieldParser.cpp
index 8f1c11e..3d3642b 100644
--- a/audio_utils/spdif/BitFieldParser.cpp
+++ b/audio_utils/spdif/BitFieldParser.cpp
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <utils/Log.h>
+#include <log/log.h>
 #include "BitFieldParser.h"
 
 namespace android {

audio_utils/spdif/DTSFrameScanner.cpp

diff --git a/audio_utils/spdif/DTSFrameScanner.cpp b/audio_utils/spdif/DTSFrameScanner.cpp
index 944f4a7..408f1b4 100644
--- a/audio_utils/spdif/DTSFrameScanner.cpp
+++ b/audio_utils/spdif/DTSFrameScanner.cpp
@@ -20,7 +20,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <utils/Log.h>
+#include <log/log.h>
 #include <audio_utils/spdif/FrameScanner.h>
 
 #include "BitFieldParser.h"

audio_utils/spdif/FrameScanner.cpp

diff --git a/audio_utils/spdif/FrameScanner.cpp b/audio_utils/spdif/FrameScanner.cpp
index 2b591e3..81de943 100644
--- a/audio_utils/spdif/FrameScanner.cpp
+++ b/audio_utils/spdif/FrameScanner.cpp
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <utils/Log.h>
+#include <log/log.h>
 #include <audio_utils/spdif/FrameScanner.h>
 
 namespace android {

audio_utils/spdif/SPDIFEncoder.cpp

diff --git a/audio_utils/spdif/SPDIFEncoder.cpp b/audio_utils/spdif/SPDIFEncoder.cpp
index 5c62299..250f961 100644
--- a/audio_utils/spdif/SPDIFEncoder.cpp
+++ b/audio_utils/spdif/SPDIFEncoder.cpp
@@ -18,7 +18,7 @@
 #include <string.h>
 
 #define LOG_TAG "AudioSPDIF"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <audio_utils/spdif/SPDIFEncoder.h>
 
 #include "AC3FrameScanner.h"