commit 83c0155ec713872c7096a7610683e0c99e1f9803
author Cyan_Hsieh <cyanhsieh@google.com> Mon Oct 15 11:05:42 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 15 11:05:42 2018 -0700
tree bd990c82016d1884ef5740aec79471241270feef
parent bb9de0b48aeac7206f104b99d2973575a9d1a2f6
parent fda46b8d5cb0539cdd9b25573fcd9ab7dbb05c5e

Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.1.R1.09.00.00.461.057' into pi-dev am: 183df93e9f
am: fda46b8d5c

Change-Id: Icb99fddd660f21aa8b0b9d6c3e0d1bf5ce7f4fb0

Android.mk

diff --git a/Android.mk b/Android.mk
index 383208d..c449f3c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../device/qcom/common/thermal-engine
+LOCAL_HEADER_LIBRARIES := libThermal_headers libcutils_headers libhardware_headers
 LOCAL_MODULE := vr.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true

vr.c

diff --git a/vr.c b/vr.c
index d8e2d03..87fd4bf 100644
--- a/vr.c
+++ b/vr.c
@@ -29,7 +29,7 @@
 #include <hardware/vr.h>
 #include <hardware/hardware.h>
 
-#include "thermal_client.h"
+#include <thermal_client.h>
 #include "vr_int.h"