summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2014-08-29 16:36:48 -0600
committerShawn Willden <swillden@google.com>2014-08-29 16:43:21 -0600
commit51d43e840673c80114b8b6a12ff3f4dfd6392c27 (patch)
tree0d972d060077ab3daa424566fd6701f6e095b7cb
parent0a4df7e3a83a59e4a5abc3f605d7d7e9f636c682 (diff)
downloadkeymaster-51d43e840673c80114b8b6a12ff3f4dfd6392c27.tar.gz
Make libkeymaster shared, and build it 32-bit when needed.
Change-Id: I55ecc1730af9339fb5cef2618bbc3c4a33868a23
-rw-r--r--Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 48a80b1..767352c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,6 +15,9 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+ifeq ($(USE_32_BIT_KEYSTORE), true)
+LOCAL_MULTILIB := 32
+endif
LOCAL_MODULE:= libkeymaster
LOCAL_SRC_FILES:= \
authorization_set.cpp \
@@ -35,4 +38,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_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)