From 914c5156b014970dde717b9a27c0c69f11cc7d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 2 Oct 2014 18:07:56 +0200
Subject: Binaries from r885 of ics-openvpn, ndk10b 32 bits.

We don't support 64 bits targets because of https://code.google.com/p/android/issues/detail?id=77004&thanks=77004&ts=1412248443.
---
 app/openssl/Ssl.mk | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'app/openssl/Ssl.mk')

diff --git a/app/openssl/Ssl.mk b/app/openssl/Ssl.mk
index 8ce82d9b..0cb93eac 100644
--- a/app/openssl/Ssl.mk
+++ b/app/openssl/Ssl.mk
@@ -3,6 +3,9 @@
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/ndk-build-clear.mk
 
+LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+LOCAL_C_INCLUDES := $(log_c_includes)
+
 # The static library should be used in only unbundled apps
 # and we don't have clang in unbundled build yet.
 LOCAL_SDK_VERSION := 9
@@ -10,9 +13,8 @@ LOCAL_SDK_VERSION := 9
 LOCAL_SRC_FILES += $(target_src_files)
 LOCAL_CFLAGS += $(target_c_flags)
 LOCAL_C_INCLUDES += $(target_c_includes)
-LOCAL_SHARED_LIBRARIES = $(log_shared_libraries)
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl_static
+LOCAL_MODULE := libssl_static
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
 include $(LOCAL_PATH)/Ssl-config-target.mk
 include $(LOCAL_PATH)/android-config.mk
@@ -23,6 +25,8 @@ include $(BUILD_STATIC_LIBRARY)
 # target shared library
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/ndk-build-clear.mk
+LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+LOCAL_C_INCLUDES := $(log_c_includes)
 
 # If we're building an unbundled build, don't try to use clang since it's not
 # in the NDK yet. This can be removed when a clang version that is fast enough
@@ -33,21 +37,26 @@ else
 LOCAL_SDK_VERSION := 9
 endif
 
-LOCAL_SHARED_LIBRARIES += libcrypto $(log_shared_libraries)
+LOCAL_SHARED_LIBRARIES += libcrypto
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl
+LOCAL_MODULE := libssl
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
 include $(LOCAL_PATH)/Ssl-config-target.mk
 include $(LOCAL_PATH)/android-config.mk
 include $(LOCAL_PATH)/ndk-build.mk
 include $(BUILD_SHARED_LIBRARY)
 
+
 # #######################################
 # # host shared library
 # include $(CLEAR_VARS)
-# LOCAL_SHARED_LIBRARIES += libcrypto-host $(log_shared_libraries)
+# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+# LOCAL_C_INCLUDES := $(log_c_includes)
+
+# LOCAL_SHARED_LIBRARIES += libcrypto-host
 # LOCAL_MODULE_TAGS := optional
-# LOCAL_MODULE:= libssl-host
+# LOCAL_MODULE := libssl-host
+# LOCAL_MULTILIB := both
 # LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
 # include $(LOCAL_PATH)/Ssl-config-host.mk
 # include $(LOCAL_PATH)/android-config.mk
@@ -56,9 +65,15 @@ include $(BUILD_SHARED_LIBRARY)
 # #######################################
 # # ssltest
 # include $(CLEAR_VARS)
-# LOCAL_SRC_FILES:= ssl/ssltest.c
-# LOCAL_SHARED_LIBRARIES := libssl libcrypto $(log_shared_libraries)
-# LOCAL_MODULE:= ssltest
+# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+# LOCAL_C_INCLUDES := $(log_c_includes)
+
+# LOCAL_SRC_FILES := ssl/ssltest.c
+# LOCAL_SHARED_LIBRARIES := libssl libcrypto
+# LOCAL_MODULE := ssltest
+# LOCAL_MULTILIB := both
+# LOCAL_MODULE_STEM_32 := ssltest
+# LOCAL_MODULE_STEM_64 := ssltest64
 # LOCAL_MODULE_TAGS := optional
 # LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
 # include $(LOCAL_PATH)/Ssl-config-host.mk
-- 
cgit v1.2.3