From 3ab9e38d4473a7a34b820d80cc442ba6c3e30564 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 15 Jul 2012 16:16:57 +0200
Subject: Add support for Certificates from Keystore under Jelly Beans (Thanks
 Kenny Root for the right pointers) Move jniglue/minivpn files to more
 sensitive places

--HG--
rename : openvpn/src/openvpn/jniglue.c => jni/jniglue.c
rename : openvpn/src/openvpn/jniglue.h => jni/jniglue.h
rename : openvpn/src/openvpn/testmain.c => jni/minivpn.c
---
 openvpn/Android.mk | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'openvpn/Android.mk')

diff --git a/openvpn/Android.mk b/openvpn/Android.mk
index ca15c711..2008adb1 100644
--- a/openvpn/Android.mk
+++ b/openvpn/Android.mk
@@ -6,8 +6,6 @@ include $(CLEAR_VARS)
 LOCAL_LDLIBS := -lz -llog 
 LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn/src/openvpn openvpn/include
 
-
-
 #LOCAL_SHARED_LIBRARIES :=  libssl  libcrypto  liblzo
 LOCAL_STATIC_LIBRARIES :=  libssl_static libcrypto_static   liblzo-static
 
@@ -15,7 +13,7 @@ LOCAL_STATIC_LIBRARIES :=  libssl_static libcrypto_static   liblzo-static
 LOCAL_CFLAGS= -DHAVE_CONFIG_H
 LOCAL_MODULE = openvpn
 
-LOCAL_SRC_FILES:= src/openvpn/jniglue.c \
+LOCAL_SRC_FILES:= \
 	src/compat/compat-basename.c \
 	src/compat/compat-daemon.c \
 	src/compat/compat-dirname.c \
@@ -92,21 +90,4 @@ include $(BUILD_SHARED_LIBRARY)
 #include $(BUILD_EXECUTABLE)
 
 
-include $(CLEAR_VARS)
-
-LOCAL_LDLIBS := -llog 
-LOCAL_SRC_FILES:= src/openvpn/jniglue.c 
-LOCAL_MODULE = opvpnutil
-include $(BUILD_SHARED_LIBRARY)
-
-
-include $(CLEAR_VARS)
-
-
-LOCAL_LDLIBS := -llog 
-LOCAL_SRC_FILES:= src/openvpn/testmain.c
-LOCAL_MODULE = minivpn
-LOCAL_SHARED_LIBRARIES=openvpn
-include $(BUILD_EXECUTABLE)
-
 
-- 
cgit v1.2.3