summaryrefslogtreecommitdiff
path: root/app/jni/Android.mk
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-06-11 11:56:59 +0200
committerParménides GV <parmegv@sdf.org>2014-06-11 19:50:54 +0200
commit3e121542d8b7ab5201c47bbd3ba5611a23c54759 (patch)
treea6035639e7baa88dd122d0d4e85791726606389a /app/jni/Android.mk
parentac69881af1b7bfcdd185989f3e434556b1d62fed (diff)
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.
Diffstat (limited to 'app/jni/Android.mk')
-rw-r--r--app/jni/Android.mk48
1 files changed, 46 insertions, 2 deletions
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)