From 4df5a2bb302fb5cb61ab48dff7fa2b1984b6ced8 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Tue, 10 Jan 2017 14:29:16 -0800
Subject: [PATCH] liblog: use log/log.h when utilizing ALOG macros

Test: compile
Bug: 30465923
Change-Id: I4329b7dc918b732b07662a27c52e3b431ffabd3d
---
 audio_route/audio_route.c              | 2 +-
 audio_utils/format.c                   | 3 ++-
 audio_utils/resampler.c                | 3 ++-
 audio_utils/tests/primitives_tests.cpp | 2 +-
 camera/tests/camera_metadata_tests.cpp | 2 +-
 radio/src/radio_metadata.c             | 4 ++--
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/audio_route/audio_route.c b/audio_route/audio_route.c
index d5782b10..37969580 100644
--- a/audio_route/audio_route.c
+++ b/audio_route/audio_route.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include <tinyalsa/asoundlib.h>
 
diff --git a/audio_utils/format.c b/audio_utils/format.c
index 9fd3931d..1803e3c3 100644
--- a/audio_utils/format.c
+++ b/audio_utils/format.c
@@ -17,7 +17,8 @@
 /* #define LOG_NDEBUG 0 */
 #define LOG_TAG "audio_utils_format"
 
-#include <android/log.h>
+#include <log/log.h>
+
 #include <audio_utils/primitives.h>
 #include <audio_utils/format.h>
 
diff --git a/audio_utils/resampler.c b/audio_utils/resampler.c
index 199f2acd..3f1f8a4c 100644
--- a/audio_utils/resampler.c
+++ b/audio_utils/resampler.c
@@ -20,7 +20,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <android/log.h>
+#include <log/log.h>
+
 #include <system/audio.h>
 #include <audio_utils/resampler.h>
 #include <speex/speex_resampler.h>
diff --git a/audio_utils/tests/primitives_tests.cpp b/audio_utils/tests/primitives_tests.cpp
index c6b1c5ca..44ba6b89 100644
--- a/audio_utils/tests/primitives_tests.cpp
+++ b/audio_utils/tests/primitives_tests.cpp
@@ -20,8 +20,8 @@
 #include <math.h>
 #include <vector>
 
-#include <android/log.h>
 #include <gtest/gtest.h>
+#include <log/log.h>
 
 #include <audio_utils/primitives.h>
 #include <audio_utils/format.h>
diff --git a/camera/tests/camera_metadata_tests.cpp b/camera/tests/camera_metadata_tests.cpp
index 2d3a74c9..121ce19a 100644
--- a/camera/tests/camera_metadata_tests.cpp
+++ b/camera/tests/camera_metadata_tests.cpp
@@ -22,8 +22,8 @@
 #include <vector>
 #include <algorithm>
 
-#include <android/log.h>
 #include <gtest/gtest.h>
+#include <log/log.h>
 
 #include "system/camera_metadata.h"
 #include "camera_metadata_hidden.h"
diff --git a/radio/src/radio_metadata.c b/radio/src/radio_metadata.c
index 47f3a184..21a73fcd 100644
--- a/radio/src/radio_metadata.c
+++ b/radio/src/radio_metadata.c
@@ -22,12 +22,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <log/log.h>
+
 #include <system/radio.h>
 #include <system/radio_metadata.h>
 #include "radio_metadata_hidden.h"
 
-#include <android/log.h>
-
 const radio_metadata_type_t metadata_key_type_table[] =
 {
     RADIO_METADATA_TYPE_TEXT,
-- 
2.11.0