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
diff --git a/keystore/Android.mk b/keystore/Android.mk
index 548f783..9faf5c2 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := keystore.cpp
+LOCAL_SRC_FILES := keystore.cpp keyblob_utils.cpp
LOCAL_C_INCLUDES := external/openssl/include
LOCAL_SHARED_LIBRARIES := libcutils libcrypto libhardware
LOCAL_MODULE := keystore
@@ -34,8 +34,8 @@
# Library for keystore clients
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := keystore_client.cpp
+LOCAL_SRC_FILES := keystore_client.cpp keyblob_utils.cpp
LOCAL_SHARED_LIBRARIES := libcutils
LOCAL_MODULE := libkeystore_client
LOCAL_MODULE_TAGS := optional
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)