summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraaronding <aaronding@google.com>2018-05-24 10:55:38 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-24 10:55:38 -0700
commit39ca311393b2a8ec5720de7cd5cf7f2a2a35e31c (patch)
tree7237912030f8f2c9397fe6672ecf2cc542f6d48c
parentf227328e933dc826c7dabe4ed576f832d7313924 (diff)
parent65a2d243cb214756e49aa8df779fcb8ec370b66a (diff)
downloadvr-39ca311393b2a8ec5720de7cd5cf7f2a2a35e31c.tar.gz
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.300' into pi-dev
am: 65a2d243cb Change-Id: I25f2dcabc54cbdb3e2ba1da1dd6fc46ea6113d74
-rw-r--r--Android.mk2
-rw-r--r--vr.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 6e43edd..1c80f3b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_C_INCLUDES := $(TARGET_BOARD_COMMON_PATH)/thermal-engine
+LOCAL_HEADER_LIBRARIES := libThermal_headers
LOCAL_MODULE := vr.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
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"