From 8eb6179930d24b5a12edca12089a717afa65d0d4 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Thu, 7 Sep 2017 17:13:08 +0800 Subject: Specify keystore dependency on libhardware_headers Emulator keystore HAL uses headers from libhardware_headers without specifying this VNDK dependency in its Android.mk, so the build will break when BOARD_VNDK_VERSION := current. Bug: 65435048 Test: lunch aosp_x86; m -j; emulator # boot to home screen Change-Id: Ia47e1cd4cf88ed00d64f43700eda556f437a9843 --- keymaster/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keymaster/Android.mk b/keymaster/Android.mk index 7203c471..e6c7b22d 100644 --- a/keymaster/Android.mk +++ b/keymaster/Android.mk @@ -15,5 +15,6 @@ LOCAL_C_INCLUDES := system/security/keystore \ $(LOCAL_PATH)/../include LOCAL_CFLAGS = -fvisibility=hidden -Wall -Werror LOCAL_SHARED_LIBRARIES := libcrypto liblog libsoftkeymasterdevice libkeymaster_messages libcutils +LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3