diff options
| author | Shawn Willden <swillden@google.com> | 2014-09-03 18:01:13 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2014-09-03 18:07:48 -0600 |
| commit | 3d1ccb333c039d7060cbf5a2c55d9e7fe047b62b (patch) | |
| tree | b809e7af2b947dfd4be685640cf39da52ae76627 | |
| parent | 51d43e840673c80114b8b6a12ff3f4dfd6392c27 (diff) | |
| download | android_system_keymaster-3d1ccb333c039d7060cbf5a2c55d9e7fe047b62b.tar.gz android_system_keymaster-3d1ccb333c039d7060cbf5a2c55d9e7fe047b62b.tar.bz2 android_system_keymaster-3d1ccb333c039d7060cbf5a2c55d9e7fe047b62b.zip | |
Make libkeymaster static, and don't build it in 32 bit mode.
Change-Id: I206a60a9bc4c8ce4a58e5ca9879b386560332cda
| -rw-r--r-- | Android.mk | 41 |
1 files changed, 32 insertions, 9 deletions
@@ -14,21 +14,44 @@ LOCAL_PATH := $(call my-dir) +### +# libkeymaster_messages contains just the code necessary to communicate with a +# GoogleKeymaster implementation, e.g. one running in TrustZone. +# +# Note that this library is too large; it should not include ocb.c and not use +# openssl. At present it must, because the code needs refactoring to separate +# concerns a bit better. +# +# TODO(swillden@google.com): Refactor and pare this down. +## include $(CLEAR_VARS) -ifeq ($(USE_32_BIT_KEYSTORE), true) -LOCAL_MULTILIB := 32 -endif -LOCAL_MODULE:= libkeymaster +LOCAL_MODULE:= libkeymaster_messages LOCAL_SRC_FILES:= \ authorization_set.cpp \ - dsa_operation.cpp \ - ecdsa_operation.cpp \ - google_keymaster \ google_keymaster_messages.cpp \ google_keymaster_utils.cpp \ + ocb.c \ key_blob.cpp \ + serializable.cpp +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/include \ + external/openssl/include +LOCAL_SHARED_LIBRARIES := libcrypto +LOCAL_CFLAGS = -Wall -Werror +LOCAL_MODULE_TAGS := optional +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE:= libkeymaster +LOCAL_SRC_FILES:= \ + authorization_set.cpp \ + google_keymaster_messages.cpp \ + google_keymaster.cpp \ + google_keymaster_utils.cpp \ ocb.c \ - rsa_operation.cpp \ + key_blob.cpp \ serializable.cpp LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ @@ -38,4 +61,4 @@ LOCAL_CFLAGS = -Wall -Werror LOCAL_MODULE_TAGS := optional LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) |