From c6f225ba3e7f3f34d01540e39afad5d69dba463f Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 12 Mar 2014 10:53:48 +0100
Subject: Fix build without openvpn3, new version

---
 main/build.gradle       |  6 +++---
 main/jni/Android.mk     | 19 ++++++++++++++++---
 main/openvpn/Android.mk |  2 +-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/main/build.gradle b/main/build.gradle
index bb40442a..a9ec1b08 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -24,8 +24,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 19
-        versionCode = 91
-        versionName = "0.6.10"
+        versionCode = 92
+        versionName = "0.6.11"
     }
 
     sourceSets {
@@ -63,7 +63,7 @@ android {
 
 
     productFlavors {
-      ovpn3
+      //ovpn3
 
       normal
                         
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index 66f2b737..3152d7e9 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -1,8 +1,12 @@
 # Path of the sources
 JNI_DIR := $(call my-dir)
 
-#USE_POLAR=1
-#USE_BREAKPAD=0
+#optional arguments
+#WITH_POLAR=1
+#WITH_OPENVPN3=1
+# Build openvpn with polar (OpenVPN3 core is always build with polar)
+#WITH_BREAKPAD=0
+
 
 include lzo/Android.mk
 include snappy/Android.mk
@@ -20,13 +24,22 @@ 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
-include ovpn3/Android.mk
+
+ifeq ($(WITH_OPENVPN3),1)
+	include ovpn3/Android.mk
+endif
 
 LOCAL_PATH := $(JNI_DIR)
 
diff --git a/main/openvpn/Android.mk b/main/openvpn/Android.mk
index b373497e..f3224201 100644
--- a/main/openvpn/Android.mk
+++ b/main/openvpn/Android.mk
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/s
 LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\"
 LOCAL_STATIC_LIBRARIES :=  liblzo-static snappy-static
 
-ifeq ($(USE_POLAR),1)
+ifeq ($(WITH_POLAR),1)
 LOCAL_STATIC_LIBRARIES +=  polarssl-static
 LOCAL_CFLAGS += -DENABLE_CRYPTO_POLARSSL=1
 else
-- 
cgit v1.2.3