diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2016-05-22 10:06:02 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2016-05-22 10:06:02 +0200 |
| commit | b4c4cf706ecb2f66c87113c2472ce2790404670f (patch) | |
| tree | 4743fc86c8f4f4c612101375da9f9f81d93b08a3 /main/jni/Android.mk | |
| parent | 1df79a1ff67a3388a26e9acd62c97639abbdc267 (diff) | |
| parent | 727fed99d567002a33c4b8e315b0677751a3e283 (diff) | |
Merge branch 'master' into androidN
Diffstat (limited to 'main/jni/Android.mk')
| -rw-r--r-- | main/jni/Android.mk | 14 |
1 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 |