From 5d61c0882c4e4dfef1630a59c3a3f5f73b6fab2f Mon Sep 17 00:00:00 2001
From: Vyacheslav Koscheev <v.koscheev@2gis.ru>
Date: Mon, 24 Apr 2017 12:21:06 +0700
Subject: Android: add logging to QtCore JNI_OnLoad

Change-Id: I15609d14ac39f89bcba72df33d33a25ac23ad516
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/corelib/kernel/qjnionload.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/corelib/kernel/qjnionload.cpp')

diff --git a/src/corelib/kernel/qjnionload.cpp b/src/corelib/kernel/qjnionload.cpp
index c936bf42fd..8f60800dba 100644
--- a/src/corelib/kernel/qjnionload.cpp
+++ b/src/corelib/kernel/qjnionload.cpp
@@ -39,6 +39,10 @@
 
 #include <jni.h>
 #include "qjnihelpers_p.h"
+#include <android/log.h>
+
+static const char logTag[] = "QtCore";
+
 
 Q_CORE_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 {
@@ -54,16 +58,24 @@ Q_CORE_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
         void *venv;
     } _JNIEnv;
 
+    __android_log_print(ANDROID_LOG_INFO, logTag, "Start");
+
     _JNIEnv uenv;
     uenv.venv = Q_NULLPTR;
 
     if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_6) != JNI_OK)
+    {
+        __android_log_print(ANDROID_LOG_FATAL, logTag, "GetEnv failed");
         return JNI_ERR;
+    }
 
     JNIEnv *env = uenv.nenv;
     const jint ret = QT_PREPEND_NAMESPACE(QtAndroidPrivate::initJNI(vm, env));
     if (ret != 0)
+    {
+        __android_log_print(ANDROID_LOG_FATAL, logTag, "initJNI failed");
         return ret;
+    }
 
     return JNI_VERSION_1_6;
 }
-- 
cgit v1.2.3