diff options
| author | Shawn Willden <swillden@google.com> | 2014-08-29 16:31:51 -0600 |
|---|---|---|
| committer | Rom Lemarchand <romlem@google.com> | 2014-08-29 23:01:00 +0000 |
| commit | b4918b9a2794a2afae08d5f8cddad639011343f1 (patch) | |
| tree | 4030fd8a075fad948c0e4ba6ca19110a88273e96 | |
| parent | 4e865753346fc6a075966972a7a98051818859db (diff) | |
| download | security-b4918b9a2794a2afae08d5f8cddad639011343f1.tar.gz | |
Build keystore in 32 bit on platforms that require it.
Change-Id: I29543f72ef677870aa3f108c1ae4cb029df2f871
| -rw-r--r-- | keystore/Android.mk | 9 | ||||
| -rw-r--r-- | softkeymaster/Android.mk | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/keystore/Android.mk b/keystore/Android.mk index 22bba014..9dca5021 100644 --- a/keystore/Android.mk +++ b/keystore/Android.mk @@ -17,6 +17,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +ifeq ($(USE_32_BIT_KEYSTORE), true) +LOCAL_MULTILIB := 32 +endif LOCAL_CFLAGS := -Wall -Wextra -Werror LOCAL_SRC_FILES := keystore.cpp keyblob_utils.cpp LOCAL_C_INCLUDES := external/openssl/include @@ -36,6 +39,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) +ifeq ($(USE_32_BIT_KEYSTORE), true) +LOCAL_MULTILIB := 32 +endif LOCAL_CFLAGS := -Wall -Wextra -Werror LOCAL_SRC_FILES := keystore_cli.cpp LOCAL_C_INCLUDES := external/openssl/include @@ -47,6 +53,9 @@ include $(BUILD_EXECUTABLE) # Library for keystore clients include $(CLEAR_VARS) +ifeq ($(USE_32_BIT_KEYSTORE), true) +LOCAL_MULTILIB := 32 +endif LOCAL_CFLAGS := -Wall -Wextra -Werror LOCAL_SRC_FILES := IKeystoreService.cpp keystore_get.cpp keyblob_utils.cpp LOCAL_SHARED_LIBRARIES := libbinder libutils liblog diff --git a/softkeymaster/Android.mk b/softkeymaster/Android.mk index 7eee9c58..0c733aa2 100644 --- a/softkeymaster/Android.mk +++ b/softkeymaster/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 := keystore.default LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := module.cpp @@ -28,6 +31,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) +ifeq ($(USE_32_BIT_KEYSTORE), true) +LOCAL_MULTILIB := 32 +endif LOCAL_MODULE := libsoftkeymaster LOCAL_SRC_FILES := keymaster_openssl.cpp LOCAL_C_INCLUDES := \ |