summaryrefslogtreecommitdiff
path: root/openssl/crypto/Android.mk
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-07-24 21:31:20 +0200
committerArne Schwabe <arne@rfc2549.org>2012-07-24 21:31:20 +0200
commit011bcb7922f5e23a04322f91318704b1e5ab231d (patch)
tree22eff1767c95713020fb26d53595793bbc837dd7 /openssl/crypto/Android.mk
parent3112a0b79549c7915355fe57e24424e2d3f92bb4 (diff)
Build openssl as shared library again, build for all Android ABIs
Diffstat (limited to 'openssl/crypto/Android.mk')
-rw-r--r--openssl/crypto/Android.mk44
1 files changed, 22 insertions, 22 deletions
diff --git a/openssl/crypto/Android.mk b/openssl/crypto/Android.mk
index b0a3bcc3..70aef35d 100644
--- a/openssl/crypto/Android.mk
+++ b/openssl/crypto/Android.mk
@@ -504,30 +504,30 @@ 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
-# # Use the NDK prebuilt libz and libdl.
-# LOCAL_LDFLAGS += -lz -ldl
-# else
-# LOCAL_SHARED_LIBRARIES += libz libdl
-# endif
+#ifneq ($(TARGET_ARCH),x86)
+#LOCAL_NDK_VERSION := 5
+#LOCAL_SDK_VERSION := 9
+## Use the NDK prebuilt libz and libdl.
+LOCAL_LDFLAGS += -lz -ldl
+#else
+#LOCAL_SHARED_LIBRARIES += libz libdl
+#endif
-# LOCAL_SRC_FILES += $(local_src_files)
-# LOCAL_CFLAGS += $(local_c_flags)
-# LOCAL_C_INCLUDES += $(local_c_includes)
-# ifeq ($(TARGET_ARCH),arm)
-# LOCAL_SRC_FILES += $(arm_src_files)
-# LOCAL_CFLAGS += $(arm_cflags)
-# else
-# LOCAL_SRC_FILES += $(non_arm_src_files)
-# endif
-# LOCAL_MODULE_TAGS := optional
-# LOCAL_MODULE:= libcrypto
-# include $(BUILD_SHARED_LIBRARY)
+LOCAL_SRC_FILES += $(local_src_files)
+LOCAL_CFLAGS += $(local_c_flags)
+LOCAL_C_INCLUDES += $(local_c_includes)
+ifeq ($(TARGET_ARCH),arm)
+ LOCAL_SRC_FILES += $(arm_src_files)
+ LOCAL_CFLAGS += $(arm_cflags)
+else
+ LOCAL_SRC_FILES += $(non_arm_src_files)
+endif
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE:= libcrypto
+include $(BUILD_SHARED_LIBRARY)
#######################################
# Host shared library