From d1cd53fa2c28f13d929979b2930dedf69b6a9aff Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Thu, 1 Mar 2018 21:31:15 -0800
Subject: power: Use log/log.h instead of utils/Log.h

Change-Id: I827c7f5ab27548eec8d6e4ee27a72fa883025002
---
 Android.mk      | 1 -
 Power.cpp       | 3 +--
 hint-data.c     | 2 +-
 list.c          | 2 +-
 power-660.c     | 2 +-
 power-710.c     | 2 +-
 power-8084.c    | 2 +-
 power-8226.c    | 2 +-
 power-845.c     | 2 +-
 power-8610.c    | 2 +-
 power-8952.c    | 2 +-
 power-8953.c    | 2 +-
 power-8974.c    | 2 +-
 power-8994.c    | 2 +-
 power-8996.c    | 2 +-
 power-8998.c    | 2 +-
 power-common.c  | 2 +-
 power-msmnile.c | 2 +-
 service.cpp     | 2 +-
 utils.c         | 2 +-
 20 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Android.mk b/Android.mk
index 41cf4f0..8086fab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,6 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libbase libhidlbase libhidltransport libutils android.hardware.power@1.2
-LOCAL_HEADER_LIBRARIES += libutils_headers
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_SRC_FILES := power-common.c metadata-parser.c utils.c list.c hint-data.c service.cpp Power.cpp
 
diff --git a/Power.cpp b/Power.cpp
index 81c0a85..11e0c21 100644
--- a/Power.cpp
+++ b/Power.cpp
@@ -29,8 +29,7 @@
 
 #define LOG_TAG "QTI PowerHAL"
 
-#include <android/log.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include "Power.h"
 #include "power-common.h"
 
diff --git a/hint-data.c b/hint-data.c
index f3403b7..bd41cf0 100644
--- a/hint-data.c
+++ b/hint-data.c
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include "hint-data.h"
 
diff --git a/list.c b/list.c
index 30a1694..7b9e4d3 100644
--- a/list.c
+++ b/list.c
@@ -32,7 +32,7 @@
 #include <string.h>
 
 #include "list.h"
-#include <utils/Log.h>
+#include <log/log.h>
 
 int init_list_head(struct list_node *head)
 {
diff --git a/power-660.c b/power-660.c
index 6ffe4a4..5b55568 100644
--- a/power-660.c
+++ b/power-660.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-710.c b/power-710.c
index 034a19c..3c5b705 100644
--- a/power-710.c
+++ b/power-710.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8084.c b/power-8084.c
index 5d4b6bf..052da24 100644
--- a/power-8084.c
+++ b/power-8084.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8226.c b/power-8226.c
index 9f14645..762f7cc 100644
--- a/power-8226.c
+++ b/power-8226.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-845.c b/power-845.c
index 9248f38..6532c9e 100644
--- a/power-845.c
+++ b/power-845.c
@@ -41,7 +41,7 @@
 #include <unistd.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8610.c b/power-8610.c
index 9f14645..762f7cc 100644
--- a/power-8610.c
+++ b/power-8610.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8952.c b/power-8952.c
index 1e29c4a..539dce9 100644
--- a/power-8952.c
+++ b/power-8952.c
@@ -40,7 +40,7 @@
 #include <pthread.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8953.c b/power-8953.c
index d0750e4..3680cbd 100644
--- a/power-8953.c
+++ b/power-8953.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8974.c b/power-8974.c
index 1e56cc3..11a16fe 100644
--- a/power-8974.c
+++ b/power-8974.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8994.c b/power-8994.c
index ddde1d8..291cb23 100644
--- a/power-8994.c
+++ b/power-8994.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8996.c b/power-8996.c
index d796160..eb8a247 100644
--- a/power-8996.c
+++ b/power-8996.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-8998.c b/power-8998.c
index f72b45a..b795897 100644
--- a/power-8998.c
+++ b/power-8998.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-common.c b/power-common.c
index 6c1e40f..1a03c77 100644
--- a/power-common.c
+++ b/power-common.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/power-msmnile.c b/power-msmnile.c
index 7000079..7a64b08 100644
--- a/power-msmnile.c
+++ b/power-msmnile.c
@@ -39,7 +39,7 @@
 #include <string.h>
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
diff --git a/service.cpp b/service.cpp
index 902c661..7aed48b 100644
--- a/service.cpp
+++ b/service.cpp
@@ -29,7 +29,7 @@
 
 #define LOG_TAG "android.hardware.power@1.2-service"
 
-#include <android/log.h>
+#include <log/log.h>
 #include <hidl/HidlTransportSupport.h>
 #include <hardware/power.h>
 #include "Power.h"
diff --git a/utils.c b/utils.c
index 97c3c55..209efc8 100644
--- a/utils.c
+++ b/utils.c
@@ -41,7 +41,7 @@
 #include "power-common.h"
 
 #define LOG_TAG "QTI PowerHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 
 char scaling_gov_path[4][80] ={
     "sys/devices/system/cpu/cpu0/cpufreq/scaling_governor",
-- 
cgit v1.2.3