diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-24 21:31:20 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-24 21:31:20 +0200 |
| commit | c5e4ffc2ecbd6781f7b0ca454391f02f99d0f77e (patch) | |
| tree | 2b59983735efebb6c1c002c7646274630984c171 /openssl/ssl | |
| parent | 83007ae1abc16de9489431cef599e9d60a518d6a (diff) | |
Build openssl as shared library again, build for all Android ABIs
Diffstat (limited to 'openssl/ssl')
| -rw-r--r-- | openssl/ssl/Android.mk | 26 |
1 files changed, 13 insertions, 13 deletions
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) |