summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-09-26 10:56:45 +0200
committerParménides GV <parmegv@sdf.org>2014-09-26 10:56:45 +0200
commitd0f652308cf1d8d121c6e3656b0c2726e523bc1f (patch)
treecc84605593cd149aaaa16aaa711c64610970e072 /app
parente5d9306d5d536d28b617f9dc2e42226e03462c70 (diff)
parent8c4b3edafc68e647bd44ae456c15f0aea9d45905 (diff)
Merge branch 'develop' into release-0.7.0
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle5
-rw-r--r--app/jni/Android.mk4
-rw-r--r--app/openvpn/.gitignore1
-rw-r--r--app/openvpn/config-version.h2
-rwxr-xr-xapp/ovpnlibs/assets/nopievpn.armeabibin5248 -> 0 bytes
-rwxr-xr-xapp/ovpnlibs/assets/nopievpn.armeabi-v7abin5256 -> 0 bytes
-rwxr-xr-xapp/ovpnlibs/assets/nopievpn.mipsbin5244 -> 0 bytes
-rwxr-xr-xapp/ovpnlibs/assets/nopievpn.x86bin5264 -> 0 bytes
-rwxr-xr-xapp/ovpnlibs/assets/pievpn.armeabibin5248 -> 0 bytes
-rwxr-xr-xapp/ovpnlibs/assets/pievpn.armeabi-v7abin5256 -> 0 bytes
-rwxr-xr-xapp/ovpnlibs/assets/pievpn.mipsbin5180 -> 0 bytes
-rwxr-xr-xapp/ovpnlibs/assets/pievpn.x86bin5264 -> 0 bytes
-rw-r--r--app/src/main/assets/minivpn.armeabibin5216 -> 0 bytes
-rw-r--r--app/src/main/assets/minivpn.armeabi-v7abin5228 -> 0 bytes
-rw-r--r--app/src/main/assets/minivpn.mipsbin5164 -> 0 bytes
-rw-r--r--app/src/main/assets/minivpn.x86bin5268 -> 0 bytes
16 files changed, 7 insertions, 5 deletions
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ