commit e0267942c66bee3a0236edaf9d66e5d6d06ed622
author Janis Danisevskis <jdanis@google.com> Tue May 02 21:51:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 02 21:51:20 2017 +0000
tree 8deddc4339cfa96cc20ecf0ca7453fc5d1a10eae
parent 7262af5c1107c9ba4788efefdb7d81d127ff37d8
parent ea3b820b93f2059360804eab119d309945250fd9

Merge "Split libkeymaster1 into libkeymaster and libkeymaster_portable"

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index c6b65da..e854772 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -64,6 +64,7 @@
 	libhidltransport \
 	android.hardware.keymaster@3.0 \
 	android.system.wifi.keystore@1.0
+LOCAL_HEADER_LIBRARIES := libbase_headers
 LOCAL_MODULE := keystore
 LOCAL_MODULE_TAGS := optional
 LOCAL_INIT_RC := keystore.rc

keystore/include/keystore/keystore_client.h

diff --git a/keystore/include/keystore/keystore_client.h b/keystore/include/keystore/keystore_client.h
index a0593c1..2ba7fd4 100644
--- a/keystore/include/keystore/keystore_client.h
+++ b/keystore/include/keystore/keystore_client.h
@@ -19,6 +19,8 @@
 #include <string>
 #include <vector>
 
+#include <android-base/macros.h>
+
 #include "authorization_set.h"
 #include "keystore.h"
 #include "keystore_return_types.h"