Remove unnecessary dependency on keystore_client

Change-Id: I801740653a6a13cb85d85204e2c8fa1b5ea2f879
(cherry picked from commit 60b72f63f6d36cfc87319bd720a4467fece6a548)

diff --git a/libkeymaster/Android.mk b/libkeymaster/Android.mk
index 975af6a258654137f0d3d7b1d7df53652809ae12..fa1950e2744306b87d2cbfacbdceb4394c4502f6 100644 (file)
--- a/libkeymaster/Android.mk
+++ b/libkeymaster/Android.mk
@@ -23,12 +23,11 @@ LOCAL_MODULE := keystore.exynos5
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw
 LOCAL_SRC_FILES := keymaster_mobicore.cpp tlcTeeKeymaster_if.c
 LOCAL_C_INCLUDES := \
-       system/security/keystore \
        external/openssl/include \
        $(MOBICORE_PATH)/daemon/ClientLib/public \
        $(MOBICORE_PATH)/common/MobiCore/inc/
 LOCAL_C_FLAGS = -fvisibility=hidden -Wall -Werror
-LOCAL_SHARED_LIBRARIES := libcrypto liblog libkeystore_client libMcClient
+LOCAL_SHARED_LIBRARIES := libcrypto liblog libMcClient
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 

diff --git a/libkeymaster/keymaster_mobicore.cpp b/libkeymaster/keymaster_mobicore.cpp
index b0a4e8dfac8d03afee17c5ff86de291096feed78..835a1d8d31f5deb4a076be6adbb8da6d1ce66a79 100644 (file)
--- a/libkeymaster/keymaster_mobicore.cpp
+++ b/libkeymaster/keymaster_mobicore.cpp
@@ -19,8 +19,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#include <keystore.h>
-
 #include <hardware/hardware.h>
 #include <hardware/keymaster.h>