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/Crypto.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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

diff --git a/app/openssl/Crypto.mk b/app/openssl/Crypto.mk
index 4214b91e..621627bf 100644
--- a/app/openssl/Crypto.mk
+++ b/app/openssl/Crypto.mk
@@ -3,13 +3,14 @@
 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
 
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libcrypto_static
+LOCAL_MODULE := libcrypto_static
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk
 include $(LOCAL_PATH)/Crypto-config-target.mk
 include $(LOCAL_PATH)/android-config.mk
@@ -25,13 +26,14 @@ include $(BUILD_STATIC_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
 # in the NDK.
 ifeq (,$(TARGET_BUILD_APPS))
 LOCAL_CLANG := true
-ifeq ($(HOST_OS), darwin_XXX)
+ifeq ($(HOST_OS), darwin_does_not_wrok)
 LOCAL_ASFLAGS += -no-integrated-as
 LOCAL_CFLAGS += -no-integrated-as
 endif
@@ -41,7 +43,7 @@ endif
 LOCAL_LDFLAGS += -ldl
 
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libcrypto
+LOCAL_MODULE := libcrypto
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk
 include $(LOCAL_PATH)/Crypto-config-target.mk
 include $(LOCAL_PATH)/android-config.mk
@@ -52,11 +54,13 @@ include $(BUILD_SHARED_LIBRARY)
 # host shared library
 # include $(CLEAR_VARS)
 # LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+# LOCAL_C_INCLUDES := $(log_c_includes)
 # LOCAL_CFLAGS += -DPURIFY
 # LOCAL_LDLIBS += -ldl
 # LOCAL_MODULE_TAGS := optional
-# LOCAL_MODULE:= libcrypto-host
+# LOCAL_MODULE := libcrypto-host
 # LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk
+# LOCAL_MULTILIB := both
 # include $(LOCAL_PATH)/Crypto-config-host.mk
 # include $(LOCAL_PATH)/android-config.mk
 # include $(BUILD_HOST_SHARED_LIBRARY)
@@ -66,10 +70,11 @@ include $(BUILD_SHARED_LIBRARY)
 
 # include $(CLEAR_VARS)
 # LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+# LOCAL_C_INCLUDES := $(log_c_includes)
 # LOCAL_CFLAGS += -DPURIFY
 # LOCAL_LDLIBS += -ldl
 # LOCAL_MODULE_TAGS := optional
-# LOCAL_MODULE:= libcrypto_static
+# LOCAL_MODULE := libcrypto_static
 # LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk
 # include $(LOCAL_PATH)/Crypto-config-host.mk
 # include $(LOCAL_PATH)/android-config.mk
-- 
cgit v1.2.3