commit 822c3a99d930e9299e2fad2fb3e0ff91b119b95a
author Kenny Root <kroot@google.com> Fri Mar 23 16:34:39 2012 -0700
committer Kenny Root <kroot@google.com> Tue Mar 27 14:58:04 2012 -0700
tree 30d12cd0df6c5921863451542a70749c2206d17b
parent 298e7b1b0f9116e2054d594d7538379d86585035

Add support for upgrading key types

Old key types were not distinguished by the keystore itself. This change
takes some of the reserved fields in the old format and changes it to a
version number and key type.

Change-Id: I45bd4cdce042617641fe7bd742bbe26da6024996

softkeymaster/Android.mk

diff --git a/softkeymaster/Android.mk b/softkeymaster/Android.mk
index 6becd78..5915208 100644
--- a/softkeymaster/Android.mk
+++ b/softkeymaster/Android.mk
@@ -23,12 +23,13 @@
 LOCAL_SRC_FILES := keymaster_openssl.cpp
 
 LOCAL_C_INCLUDES := \
+	system/security/keystore \
 	libcore/include \
 	external/openssl/include
 
 LOCAL_C_FLAGS = -fvisibility=hidden -Wall -Werror
 
-LOCAL_SHARED_LIBRARIES := libcrypto liblog
+LOCAL_SHARED_LIBRARIES := libcrypto liblog libkeystore_client
 
 LOCAL_MODULE_TAGS := optional