commit 6a203fda93404395260f2a4706f277399dd6591e
author Steven Moreland <smoreland@google.com> Mon May 01 12:35:41 2017 -0700
committer Steven Moreland <smoreland@google.com> Tue May 02 19:03:57 2017 +0000
tree ba254c91d86a475b5e8b9bdac3ff9ed9530c924d
parent 80f5705fb59af59dc2b8952a2b32ba3ca7ac26d4

Explicitly declare dependencies on libbase macros.

These were being included transitively through libhidl.

Test: links
Bug: 37791060
Change-Id: I6cbe3a64b1ae078b4625c5e4b905be50e04f7a55
(cherry picked from commit 52868f226ec5e7bb02947c5647bc8b803c8bae83)

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index 8231bf1..f87675d 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -63,6 +63,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"