From fd419f1e718d6f17a89fe27767cfaa89bf639b3a Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 18 Oct 2014 01:43:13 +0200
Subject: Prepare OpenVPN for Android for the sweetest Android yet

---
 main/build.gradle          |  9 ++++-----
 main/misc/build-native.bat | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/main/build.gradle b/main/build.gradle
index 6cdc1d7c..7e6830a0 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -12,14 +12,13 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
-
+    compileSdkVersion 21
+    buildToolsVersion "21"
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion 21
         versionCode = 99
-        versionName = "0.6.18"
+        versionName = "0.6.19"
     }
 
     sourceSets {
diff --git a/main/misc/build-native.bat b/main/misc/build-native.bat
index 73a19a00..9885557a 100644
--- a/main/misc/build-native.bat
+++ b/main/misc/build-native.bat
@@ -1,22 +1,25 @@
 
 @echo on
-echo Currently broken, feel free to fix and send me a patch, see .sh file
+echo Currently broken, feel free to fix and send me a patch, see the build-native.sh file how native libraries are build on UNIX
 exit 1
 
-call ndk-build APP_API=all -j 8
+call ndk-build APP_ABI=x86_64 -j 8 USE_BREAKPAD=0
 
 
 cd libs
-mkdir ..\assets
-mkdir ..\build\
+mkdir ..\ovpnlibs
+mkdir ..\ovpnlibs\assets
 
 for /D %%f in (*) do (
-	copy %%f\minivpn ..\assets\minivpn.%%f
+	copy %%f\nopievpn ..\ovpnlibs\assets\nopievpn.%%f
+	copy %%f\pievpn ..\ovpnlibs\assets\pievpn.%%f
+
 	del %%f\libcrypto.so
 	del %%f\libssl.so
 
-	mkdir ..\build\native-libs\%%f\
-	copy %%f\*.so  ..\build\native-libs\%%f\
+    mkdir ..\ovpnlibs\jniLibs
+	mkdir ..\ovpnlibs\jniLibs\%%f\
+	copy %%f\*.so  ..\ovpnlibs\jniLibs\%%f\
 )
 
 cd ..
-- 
cgit v1.2.3