From c206a91d320995f37f8abb33188bfd384249da3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 7 Apr 2014 20:43:34 +0200 Subject: Next step: compile jni sources correctly. --- .gitignore | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 338aab70..0567b6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,10 @@ id.zip /build-native.sh.bk /build-native.sh~ -build.gradle local.properties -*.java~ +*~ +*.iml +.idea +build +.gradle +jniLibs \ No newline at end of file -- cgit v1.2.3 From 5fc5d37330d3535a0f421632694d1e7918fc22d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 11:38:09 +0200 Subject: Compiles correctly: app/build-native + gradle. --- .gitignore | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 0567b6f1..4f4b96a7 100644 --- a/.gitignore +++ b/.gitignore @@ -47,10 +47,10 @@ openvpn/src/Makefile.in openvpn/src/compat/Makefile.in openvpn/src/openvpnserv/Makefile.in openvpn/tests/Makefile.in -assets/minivpn.armeabi -assets/minivpn.armeabi-v7a -assets/minivpn.mips -assets/minivpn.x86 +app/assets/minivpn.armeabi +app/assets/minivpn.armeabi-v7a +app/assets/minivpn.mips +app/assets/minivpn.x86 openvpn/a.out.dSYM openvpn/config-version.h openvpn/config.status @@ -74,4 +74,5 @@ local.properties .idea build .gradle -jniLibs \ No newline at end of file +jniLibs +/app/ovpnlibs/ -- cgit v1.2.3 From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 12:04:17 +0200 Subject: Rename app->bitmask_android This way, gradle commands generate apks correctly named. --- .gitignore | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 4f4b96a7..1c3dea0a 100644 --- a/.gitignore +++ b/.gitignore @@ -47,10 +47,10 @@ openvpn/src/Makefile.in openvpn/src/compat/Makefile.in openvpn/src/openvpnserv/Makefile.in openvpn/tests/Makefile.in -app/assets/minivpn.armeabi -app/assets/minivpn.armeabi-v7a -app/assets/minivpn.mips -app/assets/minivpn.x86 +bitmask_android/assets/minivpn.armeabi +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 @@ -75,4 +75,4 @@ local.properties build .gradle jniLibs -/app/ovpnlibs/ +bitmask_android/ovpnlibs/ -- cgit v1.2.3 From a097a3388137d6553dcf934d0cee49a876a688eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 18:41:53 +0200 Subject: Build release apk using gradle.properties. I ignore that file, it contains passwords, although I have encrypted it to myself. --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 1c3dea0a..c4d9ae2a 100644 --- a/.gitignore +++ b/.gitignore @@ -69,6 +69,7 @@ id.zip /build-native.sh~ local.properties +gradle.properties* *~ *.iml .idea -- cgit v1.2.3