From e2d3bfe01ad9b4778dd405abda0ddc81424fe104 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 9 May 2012 14:22:15 +0200
Subject: Version 0.5.0 + minimal faq addition

---
 openssl/crypto/Android.mk | 44 ++++++++++++++++++++++----------------------
 openssl/ssl/Android.mk    | 24 ++++++++++++------------
 2 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'openssl')

diff --git a/openssl/crypto/Android.mk b/openssl/crypto/Android.mk
index fab9d57d..b0a3bcc3 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
diff --git a/openssl/ssl/Android.mk b/openssl/ssl/Android.mk
index 4fe7f196..87af2f3e 100644
--- a/openssl/ssl/Android.mk
+++ b/openssl/ssl/Android.mk
@@ -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