Merge branch 'develop' into release-0.7.0

17 files changed, 8 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index b5067c60..804337f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ bitmask_android/assets/minivpn.armeabi-v7a
 bitmask_android/assets/minivpn.mips
 bitmask_android/assets/minivpn.x86
 openvpn/a.out.dSYM
-openvpn/config-version.h
 openvpn/config.status
 Makefile
 openvpn/libtool
@@ -76,9 +75,9 @@ gradle.properties*
 build
 .gradle
 jniLibs
-bitmask_android/ovpnlibs/
 G*
 *.dot
 /ics-openvpn/
 /TAGS
 /ics-openvpn
+app/ovpnlibs
diff --git a/app/build.gradle b/app/build.gradle
index 822c7124..1057da44 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,8 @@ android {
   buildTypes {
     release {
       //runProguard true
-      signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug
+      if(signingConfigs.contains(release))
+	signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug
     }
   }
 
@@ -155,7 +156,7 @@ task updateIcsOpenVpn( type: Copy, dependsOn: 'mergeUntranslatable') {
   } into '.'
 }
 
-assembleRelease.dependsOn connectedCheck
+//assembleRelease.dependsOn connectedCheck
 afterEvaluate {
   //installRelease.dependsOn connectedCheck
 }
diff --git a/app/jni/Android.mk b/app/jni/Android.mk
index 33d0bc76..0c906f97 100644
--- a/app/jni/Android.mk
+++ b/app/jni/Android.mk
@@ -5,7 +5,7 @@ JNI_DIR := $(call my-dir)
 #WITH_POLAR=1
 #WITH_OPENVPN3=1
 # Build openvpn with polar (OpenVPN3 core is always build with polar)
-#WITH_BREAKPAD=0
+WITH_BREAKPAD=0
 
 
 include lzo/Android.mk
@@ -13,7 +13,7 @@ include snappy/Android.mk
 
 include openssl/Android.mk
 
-ifneq ($(USE_BREAKPAD),0)
+ifneq ($(WITH_BREAKPAD),0)
 	ifneq ($(TARGET_ARCH),mips)
 	WITH_BREAKPAD=1
 	include google-breakpad/android/google_breakpad/Android.mk
diff --git a/app/openvpn/.gitignore b/app/openvpn/.gitignore
index 538c0208..94b3b9a1 100644
--- a/app/openvpn/.gitignore
+++ b/app/openvpn/.gitignore
@@ -53,7 +53,6 @@ distro/rpm/openvpn.spec
 tests/t_client.sh
 tests/t_client-*-20??????-??????/
 src/openvpn/openvpn
-config-version.h
 nbproject
 test-driver
 compile
diff --git a/app/openvpn/config-version.h b/app/openvpn/config-version.h
new file mode 100644
index 00000000..762b9dc6
--- /dev/null
+++ b/app/openvpn/config-version.h
@@ -0,0 +1,2 @@
+#define CONFIGURE_GIT_REVISION "icsopenvpn_618-e63b88d330782d14"
+#define CONFIGURE_GIT_FLAGS ""
diff --git a/app/ovpnlibs/assets/nopievpn.armeabi b/app/ovpnlibs/assets/nopievpn.armeabi
deleted file mode 100755
index 908dceab..00000000
--- a/app/ovpnlibs/assets/nopievpn.armeabi
+++ /dev/null
diff --git a/app/ovpnlibs/assets/nopievpn.armeabi-v7a b/app/ovpnlibs/assets/nopievpn.armeabi-v7a
deleted file mode 100755
index bba1ea22..00000000
--- a/app/ovpnlibs/assets/nopievpn.armeabi-v7a
+++ /dev/null
diff --git a/app/ovpnlibs/assets/nopievpn.mips b/app/ovpnlibs/assets/nopievpn.mips
deleted file mode 100755
index e30fde3e..00000000
--- a/app/ovpnlibs/assets/nopievpn.mips
+++ /dev/null
diff --git a/app/ovpnlibs/assets/nopievpn.x86 b/app/ovpnlibs/assets/nopievpn.x86
deleted file mode 100755
index 8a4b7d13..00000000
--- a/app/ovpnlibs/assets/nopievpn.x86
+++ /dev/null
diff --git a/app/ovpnlibs/assets/pievpn.armeabi b/app/ovpnlibs/assets/pievpn.armeabi
deleted file mode 100755
index 8849f862..00000000
--- a/app/ovpnlibs/assets/pievpn.armeabi
+++ /dev/null
diff --git a/app/ovpnlibs/assets/pievpn.armeabi-v7a b/app/ovpnlibs/assets/pievpn.armeabi-v7a
deleted file mode 100755
index fce4d077..00000000
--- a/app/ovpnlibs/assets/pievpn.armeabi-v7a
+++ /dev/null
diff --git a/app/ovpnlibs/assets/pievpn.mips b/app/ovpnlibs/assets/pievpn.mips
deleted file mode 100755
index 6e4ba6a4..00000000
--- a/app/ovpnlibs/assets/pievpn.mips
+++ /dev/null
diff --git a/app/ovpnlibs/assets/pievpn.x86 b/app/ovpnlibs/assets/pievpn.x86
deleted file mode 100755
index df9b45eb..00000000
--- a/app/ovpnlibs/assets/pievpn.x86
+++ /dev/null
diff --git a/app/src/main/assets/minivpn.armeabi b/app/src/main/assets/minivpn.armeabi
deleted file mode 100644
index 7018dbc9..00000000
--- a/app/src/main/assets/minivpn.armeabi
+++ /dev/null
diff --git a/app/src/main/assets/minivpn.armeabi-v7a b/app/src/main/assets/minivpn.armeabi-v7a
deleted file mode 100644
index a8e01017..00000000
--- a/app/src/main/assets/minivpn.armeabi-v7a
+++ /dev/null
diff --git a/app/src/main/assets/minivpn.mips b/app/src/main/assets/minivpn.mips
deleted file mode 100644
index c44e56c5..00000000
--- a/app/src/main/assets/minivpn.mips
+++ /dev/null
diff --git a/app/src/main/assets/minivpn.x86 b/app/src/main/assets/minivpn.x86
deleted file mode 100644
index 1a6bf464..00000000
--- a/app/src/main/assets/minivpn.x86
+++ /dev/null