From 81a221b2627daf122f8fcc36710eac8b3388acfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 27 Jan 2015 13:47:12 +0100 Subject: Import ics-openvpn-stripped correctly. --- app/jni/jniglue.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/jni/jniglue.c') diff --git a/app/jni/jniglue.c b/app/jni/jniglue.c index d446f78c..85d2f2d5 100644 --- a/app/jni/jniglue.c +++ b/app/jni/jniglue.c @@ -14,7 +14,9 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { void android_openvpn_log(int level,const char* prefix,const char* prefix_sep,const char* m1) { +#ifndef NDEBUG __android_log_print(ANDROID_LOG_DEBUG,"openvpn","%s%s%s",prefix,prefix_sep,m1); +#endif } void Java_de_blinkt_openvpn_core_NativeUtils_jniclose(JNIEnv *env,jclass jo, jint fd) { -- cgit v1.2.3 From 6b53c24fd638dc8aaf35279c7ecadaea003f2b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 27 Jan 2015 14:06:15 +0100 Subject: Revert when Arne makes this change on ics-openvpn --- app/jni/jniglue.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/jni/jniglue.c') diff --git a/app/jni/jniglue.c b/app/jni/jniglue.c index 85d2f2d5..c2dd9f1e 100644 --- a/app/jni/jniglue.c +++ b/app/jni/jniglue.c @@ -7,7 +7,9 @@ #include "jniglue.h" jint JNI_OnLoad(JavaVM *vm, void *reserved) { +#ifndef NDEBUG __android_log_write(ANDROID_LOG_DEBUG,"openvpn", "Loading openvpn native library $id$ compiled on " __DATE__ " " __TIME__ ); +#endif return JNI_VERSION_1_2; } -- cgit v1.2.3 From c95a21a736fadb46685e051064b0ec1efdae667a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sat, 31 Jan 2015 01:19:49 +0100 Subject: Updated ics-openvpn to rev 1020. Improved build.gradle script. --- app/jni/jniglue.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'app/jni/jniglue.c') diff --git a/app/jni/jniglue.c b/app/jni/jniglue.c index c2dd9f1e..12e67543 100644 --- a/app/jni/jniglue.c +++ b/app/jni/jniglue.c @@ -16,9 +16,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { void android_openvpn_log(int level,const char* prefix,const char* prefix_sep,const char* m1) { -#ifndef NDEBUG __android_log_print(ANDROID_LOG_DEBUG,"openvpn","%s%s%s",prefix,prefix_sep,m1); -#endif } void Java_de_blinkt_openvpn_core_NativeUtils_jniclose(JNIEnv *env,jclass jo, jint fd) { -- cgit v1.2.3