Make thermal.$TARGET_BOARD_PLATFORM build with the VNDK.

When the vndk is enabled (BOARD_VNDK_VERSION=current),
vendor libraries must only link against vendor variants
in the build system. This also means that they receive
restricted sets of headers and that automatic global
headers are restricted.

Test: build thermal.$TARGET_BOARD_PLATFORM with BOARD_VNDK_VERSION=current
Bug: 69574580
Change-Id: Ife9a615c0f6c0222b25a8a8b23a6709b6bf7e358

4 files changed, 4 insertions, 3 deletions

diff --git a/Android.mk b/Android.mk
index 5b2add9..12c2dee 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,7 @@ LOCAL_SRC_FILES := thermal-default.c
 endif
 
 LOCAL_SHARED_LIBRARIES := liblog libcutils
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -Wno-unused-parameter
 
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>
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>
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>