summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2016-05-05 13:20:37 +0200
committerArne Schwabe <arne@rfc2549.org>2016-05-05 13:20:37 +0200
commitf7865e2e7862a22c5762dbc8df53c98fb27d5440 (patch)
treed9277e129fe6da578cf34f19c695708d425947e9 /main
parent918f17fa3558912970483b73474dcab955306e20 (diff)
Update OpenVPN
Diffstat (limited to 'main')
-rw-r--r--main/jni/Android.mk14
m---------main/openvpn0
2 files changed, 7 insertions, 7 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index c61db83e..fed2bdea 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -2,9 +2,9 @@
JNI_DIR := $(call my-dir)
#optional arguments
-#WITH_POLAR=1
+#WITH_MBEDTLS=1
#WITH_OPENVPN3=1
-# Build openvpn with polar (OpenVPN3 core is always build with polar)
+# Build openvpn with mbedTLS (OpenVPN3 core is always build with mbedTLS)
#WITH_BREAKPAD=0
@@ -25,15 +25,15 @@ else
WITH_BREAKPAD=0
endif
-ifeq ($(WITH_POLAR),1)
- USE_POLAR=1
+ifeq ($(WITH_MBEDTLS),1)
+ USE_MBEDTLS=1
endif
ifeq ($(WITH_OPENVPN3),1)
- USE_POLAR=1
+ USE_MBEDTLS=1
endif
-ifeq ($(USE_POLAR),1)
- include polarssl/Android.mk
+ifeq ($(USE_MBEDTLS),1)
+ include mbedtls/Android.mk
endif
include openvpn/Android.mk
diff --git a/main/openvpn b/main/openvpn
-Subproject 049858bb44a04f3a52395b523a262f9c9b7dd51
+Subproject a7bf6fceeae8646888e8f64a9c36222fd987e5c