From 81a221b2627daf122f8fcc36710eac8b3388acfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 27 Jan 2015 13:47:12 +0100
Subject: Import ics-openvpn-stripped correctly.

---
 app/build.gradle  | 2 +-
 app/jni/jniglue.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/build.gradle b/app/build.gradle
index 5b507e13..db928f0b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -176,7 +176,7 @@ task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') {
 }
 
 task updateIcsOpenVpn( type: Copy, dependsOn: 'mergeUntranslatable') {
-  from('../ics-openvpn-stripped/main/src/') {
+  from('../ics-openvpn-stripped/') {
     include 'openvpn/**/*'
     include 'openssl/**/*'    
     include 'lzo/**/**'
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