From 394451dbae3e71282611058e00b5fd16c865f147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 26 Sep 2014 09:46:26 +0200
Subject: Revert "Updated native subprojects from ics-openvpn."

This reverts commit d0e7ba3029b2fd42582413aa95773fe7dbdede90.

I'll postpone this work for the next cycle, it's not trivial because it doesn't link properly.
---
 app/openssl/Crypto.mk | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

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

diff --git a/app/openssl/Crypto.mk b/app/openssl/Crypto.mk
index 6565f97c..4214b91e 100644
--- a/app/openssl/Crypto.mk
+++ b/app/openssl/Crypto.mk
@@ -9,7 +9,7 @@ LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 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
@@ -31,7 +31,7 @@ LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 # in the NDK.
 ifeq (,$(TARGET_BUILD_APPS))
 LOCAL_CLANG := true
-ifeq ($(HOST_OS), darwin_does_not_wrok)
+ifeq ($(HOST_OS), darwin_XXX)
 LOCAL_ASFLAGS += -no-integrated-as
 LOCAL_CFLAGS += -no-integrated-as
 endif
@@ -41,7 +41,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
@@ -50,16 +50,16 @@ include $(BUILD_SHARED_LIBRARY)
 
 #######################################
 # host shared library
-#include $(CLEAR_VARS)
-#LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
-#LOCAL_CFLAGS += -DPURIFY
-#LOCAL_LDLIBS += -ldl
-#LOCAL_MODULE_TAGS := optional
-#LOCAL_MODULE := libcrypto-host
-#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
-#include $(BUILD_HOST_SHARED_LIBRARY)
+# include $(CLEAR_VARS)
+# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+# LOCAL_CFLAGS += -DPURIFY
+# LOCAL_LDLIBS += -ldl
+# LOCAL_MODULE_TAGS := optional
+# LOCAL_MODULE:= libcrypto-host
+# 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
+# include $(BUILD_HOST_SHARED_LIBRARY)
 
 ########################################
 # host static library, which is used by some SDK tools.
@@ -69,9 +69,8 @@ include $(BUILD_SHARED_LIBRARY)
 # 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
 # include $(BUILD_HOST_STATIC_LIBRARY)
-
-- 
cgit v1.2.3