From 011bcb7922f5e23a04322f91318704b1e5ab231d Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 24 Jul 2012 21:31:20 +0200 Subject: Build openssl as shared library again, build for all Android ABIs --- openssl/ssl/Android.mk | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'openssl/ssl/Android.mk') diff --git a/openssl/ssl/Android.mk b/openssl/ssl/Android.mk index 87af2f3e..1319d5e1 100644 --- a/openssl/ssl/Android.mk +++ b/openssl/ssl/Android.mk @@ -1,5 +1,5 @@ LOCAL_PATH:= $(call my-dir) - + local_c_includes := \ openssl \ openssl/include \ @@ -61,18 +61,18 @@ include $(BUILD_STATIC_LIBRARY) ####################################### # target shared library -# include $(CLEAR_VARS) -# include $(LOCAL_PATH)/../android-config.mk +include $(CLEAR_VARS) +include $(LOCAL_PATH)/../android-config.mk -# ifneq ($(TARGET_ARCH),x86) -# LOCAL_NDK_VERSION := 5 -# LOCAL_SDK_VERSION := 9 -# endif -# LOCAL_SRC_FILES += $(local_src_files) -# LOCAL_C_INCLUDES += $(local_c_includes) -# LOCAL_SHARED_LIBRARIES += libcrypto -# LOCAL_MODULE_TAGS := optional -# LOCAL_MODULE:= libssl -# include $(BUILD_SHARED_LIBRARY) +ifneq ($(TARGET_ARCH),x86) +LOCAL_NDK_VERSION := 5 +LOCAL_SDK_VERSION := 9 +endif +LOCAL_SRC_FILES += $(local_src_files) +LOCAL_C_INCLUDES += $(local_c_includes) +LOCAL_SHARED_LIBRARIES += libcrypto +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE:= libssl +include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3