From 7c72abb5ba400538e0634f9a3caf0104514cdb46 Mon Sep 17 00:00:00 2001
From: Nick Bray <ncbray@google.com>
Date: Tue, 13 Feb 2018 15:11:04 -0800
Subject: Use new include paths.

Also make libhardware header include path explicit. This will make it
possible to remove libhardware as a global overlay.

Change-Id: Id21968e8b2dbb63e074ca247979530a4d876681e
---
 ipc/gatekeeper_ipc.cpp | 2 +-
 rules.mk               | 3 ++-
 trusty_gatekeeper.cpp  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ipc/gatekeeper_ipc.cpp b/ipc/gatekeeper_ipc.cpp
index e29c2e2..3dd2f87 100644
--- a/ipc/gatekeeper_ipc.cpp
+++ b/ipc/gatekeeper_ipc.cpp
@@ -25,7 +25,7 @@ extern "C" {
 #include <trusty_std.h>
 #include <trusty_ipc.h>
 
-#include <err.h>
+#include <uapi/err.h>
 
 #include "trusty_gatekeeper.h"
 #include "gatekeeper_ipc.h"
diff --git a/rules.mk b/rules.mk
index 15aec82..ab4fbbe 100644
--- a/rules.mk
+++ b/rules.mk
@@ -34,7 +34,8 @@ MODULE_DEPS += \
 	system/gatekeeper \
 
 MODULE_INCLUDES += \
-	$(LOCAL_DIR)
+	$(LOCAL_DIR) \
+	$(LOCAL_DIR)/../../hardware/libhardware/include
 
 include $(LOCAL_DIR)/$(IPC)/rules.mk
 
diff --git a/trusty_gatekeeper.cpp b/trusty_gatekeeper.cpp
index 6e97ad8..024dfb2 100644
--- a/trusty_gatekeeper.cpp
+++ b/trusty_gatekeeper.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <openssl/hmac.h>
-#include <err.h>
+#include <uapi/err.h>
 
 extern "C" {
 #include <lib/hwkey/hwkey.h>
-- 
cgit v1.2.3