From 011bcb7922f5e23a04322f91318704b1e5ab231d Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 24 Jul 2012 21:31:20 +0200
Subject: Build openssl as shared library again, build for all Android ABIs

---
 jni/Android.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'jni/Android.mk')

diff --git a/jni/Android.mk b/jni/Android.mk
index 3de07059..ee137f81 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,5 +1,6 @@
 # Path of the sources
 
+
 JNI_DIR := $(call my-dir)
 
 include lzo/Android.mk
@@ -13,19 +14,18 @@ LOCAL_PATH := $(JNI_DIR)
 
 # The only real JNI library
 include $(CLEAR_VARS)
-LOCAL_LDLIBS := -llog 
+LOCAL_LDLIBS := -llog  -lz
 LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl 
 LOCAL_SRC_FILES:= jniglue.c jbcrypto.cpp
 LOCAL_MODULE = opvpnutil
-LOCAL_STATIC_LIBRARIES :=  libcrypto_static
+LOCAL_SHARED_LIBRARIES :=  libcrypto
 include $(BUILD_SHARED_LIBRARY)
 
 
-
 include $(CLEAR_VARS)
-LOCAL_LDLIBS := -llog 
+LOCAL_LDLIBS := -lz 
+LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn
 LOCAL_SRC_FILES:= minivpn.c 
 LOCAL_MODULE = minivpn
-LOCAL_SHARED_LIBRARIES=openvpn
 include $(BUILD_EXECUTABLE)
 
-- 
cgit v1.2.3