diff options
| author | Nick Bray <ncbray@google.com> | 2018-02-13 15:11:04 -0800 |
|---|---|---|
| committer | Nick Bray <ncbray@google.com> | 2018-02-13 15:11:04 -0800 |
| commit | 7c72abb5ba400538e0634f9a3caf0104514cdb46 (patch) | |
| tree | 00acc7e2298a9781ddff4301ab064bda5212ea3e | |
| parent | e4bd07680b9ca98347c5ae3785a52f457816f06c (diff) | |
| download | gatekeeper-7c72abb5ba400538e0634f9a3caf0104514cdb46.tar.gz | |
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
| -rw-r--r-- | ipc/gatekeeper_ipc.cpp | 2 | ||||
| -rw-r--r-- | rules.mk | 3 | ||||
| -rw-r--r-- | 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" @@ -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> |