summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-01-27 13:47:12 +0100
committerParménides GV <parmegv@sdf.org>2015-01-30 12:03:59 +0100
commit81a221b2627daf122f8fcc36710eac8b3388acfd (patch)
tree3d171115de000600024894adfb502f67754d4ff8 /app
parent48d6911fa5e63b458eb533e2b3d98f784496da8a (diff)
Import ics-openvpn-stripped correctly.
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle2
-rw-r--r--app/jni/jniglue.c2
2 files changed, 3 insertions, 1 deletions
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) {