From 7ff484bd48f064998f8d4481b2e4f8164d539573 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 31 Jan 2018 12:28:32 +0100
Subject: Fix some build script issues.

---
 main/build.gradle | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'main/build.gradle')

diff --git a/main/build.gradle b/main/build.gradle
index 87a36ef7..680bba69 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -37,8 +37,11 @@ task ("generateOpenVPN3Swig" ,type:Exec) {
     doFirst {
         mkdir openvpn3SwigFiles
     }
-    commandLine "swig", "-outdir", openvpn3SwigFiles, "-c++", "-java", "-package", "net.openvpn.ovpn3",
-            "-Isrc/main/cpp/openvpn3/client", "-Isrc/main/cpp/openvpn3/", "src/main/cpp/openvpn3/javacli/ovpncli.i"
+    commandLine "swig", "-outdir", openvpn3SwigFiles, "-outcurrentdir", "-c++", "-java", "-package", "net.openvpn.ovpn3",
+            "-Isrc/main/cpp/openvpn3/client", "-Isrc/main/cpp/openvpn3/",
+            "-o", "${openvpn3SwigFiles}/ovpncli_wrap.cxx", "-oh", "${openvpn3SwigFiles}/ovpncli_wrap.h",
+            "src/main/cpp/openvpn3/javacli/ovpncli.i"
+
 }
 
 android {
@@ -108,10 +111,13 @@ android {
     productFlavors {
         noovpn3 {
             dimension "implementation"
+            buildConfigField 'boolean', 'openvpn3', 'false'
         }
 
         normal {
             dimension "implementation"
+            buildConfigField 'boolean', 'openvpn3', 'true'
+
         }
 
     }
-- 
cgit v1.2.3