commit b9d9e99703d662976078887d105644ccd7d03759
author aaronding <aaronding@google.com> Fri May 25 12:05:15 2018 +0800
committer aaronding <aaronding@google.com> Fri May 25 16:39:36 2018 +0800
tree 787eaae95d55a768a7b7deb0d61d1481ad4f877e
parent cdd8c78579b3e806b799f1442a8af2a872dc75d6
parent 34f922d74a2e0bc81815785c49e7c8598a628647

Merge branch 'qcom/release/LA.UM.7.3.9.08.00.00.385.328' into pi-dev

Bug: 80274434
Change-Id: Iefdbda80a48cdeb660eb6ba739b86912b41e8e2c

Android.mk

diff --git a/Android.mk b/Android.mk
index c8725dd..cf89a91 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,6 +38,7 @@
 
 LOCAL_HEADER_LIBRARIES := libutils_headers libhardware_headers
 LOCAL_SHARED_LIBRARIES := liblog libcutils
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -Wno-unused-parameter
 

thermal-845.c

diff --git a/thermal-845.c b/thermal-845.c
index a6a9e3e..4340af4 100644
--- a/thermal-845.c
+++ b/thermal-845.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #define LOG_TAG "ThermalHAL-845"
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <hardware/hardware.h>
 #include <hardware/thermal.h>

thermal-8998.c

diff --git a/thermal-8998.c b/thermal-8998.c
index a43159b..35fbaf8 100644
--- a/thermal-8998.c
+++ b/thermal-8998.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #define LOG_TAG "ThermalHAL-8998"
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <hardware/hardware.h>
 #include <hardware/thermal.h>

thermal.c

diff --git a/thermal.c b/thermal.c
index 684c52f..8862311 100644
--- a/thermal.c
+++ b/thermal.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #define LOG_TAG "ThermalHAL"
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <hardware/hardware.h>
 #include <hardware/thermal.h>