From 3e121542d8b7ab5201c47bbd3ba5611a23c54759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 11 Jun 2014 11:56:59 +0200
Subject: Correctly connects to millipede.

Location keyword on android.cfg isn't supported, EIP corresponding code
has been commented out. I think we should support it in ics-openvpn, so
that we can show the location instead of the server name.

I've updated all opensssl, openvpn, etc. subprojects from rev 813 of
ics-openvpn, and jni too.
---
 app/jni/Android.mk | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

(limited to 'app/jni/Android.mk')

diff --git a/app/jni/Android.mk b/app/jni/Android.mk
index 3514b920..a3280bd6 100644
--- a/app/jni/Android.mk
+++ b/app/jni/Android.mk
@@ -1,12 +1,45 @@
 # Path of the sources
 JNI_DIR := $(call my-dir)
 
+#optional arguments
+#WITH_POLAR=1
+#WITH_OPENVPN3=1
+# Build openvpn with polar (OpenVPN3 core is always build with polar)
+USE_BREAKPAD=0
+WITH_BREAKPAD=0
+
 include lzo/Android.mk
+include snappy/Android.mk
 
 include openssl/Android.mk
 
+ifneq ($(USE_BREAKPAD),0)
+	ifneq ($(TARGET_ARCH),mips)
+	WITH_BREAKPAD=1
+#	include google-breakpad/android/google_breakpad/Android.mk
+	else
+	WITH_BREAKPAD=0
+	endif
+else
+WITH_BREAKPAD=0
+endif
+
+ifeq ($(WITH_POLAR),1)
+	USE_POLAR=1
+endif
+ifeq ($(WITH_OPENVPN3),1)
+	USE_POLAR=1
+endif
+
+ifeq ($(USE_POLAR),1)
+	include polarssl/Android.mk
+endif
+
 include openvpn/Android.mk
 
+ifeq ($(WITH_OPENVPN3),1)
+	include ovpn3/Android.mk
+endif
 
 LOCAL_PATH := $(JNI_DIR)
 
@@ -23,7 +56,18 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_LDLIBS := -lz  -lc 
 LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn
-LOCAL_SRC_FILES:= minivpn.c 
-LOCAL_MODULE = minivpn
+LOCAL_SRC_FILES:= minivpn.c dummy.cpp
+LOCAL_MODULE = nopievpn
+include $(BUILD_EXECUTABLE)
+
+
+include $(CLEAR_VARS)
+LOCAL_LDLIBS := -lz  -lc 
+LOCAL_CFLAGS= -fPIE -pie
+LOCAL_CFLAGS = -fPIE
+LOCAL_LDFLAGS = -fPIE -pie
+LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn
+LOCAL_SRC_FILES:= minivpn.c dummy.cpp
+LOCAL_MODULE = pievpn
 include $(BUILD_EXECUTABLE)
 
-- 
cgit v1.2.3