diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/corelib/kernel/qjnihelpers.cpp | 36 | ||||
-rw-r--r-- | src/corelib/kernel/qjnionload.cpp | 79 |
3 files changed, 36 insertions, 80 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index aeced4a588..06acea216b 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -983,7 +983,6 @@ qt_internal_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED kernel/qjnienvironment.cpp kernel/qjnienvironment.h kernel/qjniobject.cpp kernel/qjniobject.h kernel/qjnihelpers.cpp kernel/qjnihelpers_p.h - kernel/qjnionload.cpp platform/android/qandroidnativeinterface.cpp ) diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index a7e368017a..219b371441 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -50,6 +50,7 @@ #include <QtCore/private/qcoreapplication_p.h> #include <QtCore/qrunnable.h> +#include <android/log.h> #include <deque> #include <memory> @@ -619,4 +620,39 @@ jobject QtAndroidPrivate::callOnBindListener(jobject intent) QT_END_NAMESPACE +Q_CORE_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) +{ + Q_UNUSED(reserved); + + static const char logTag[] = "QtCore"; + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + + typedef union { + JNIEnv *nenv; + void *venv; + } _JNIEnv; + + __android_log_print(ANDROID_LOG_INFO, logTag, "Start"); + + _JNIEnv uenv; + uenv.venv = 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; +} + #include "qjnihelpers.moc" diff --git a/src/corelib/kernel/qjnionload.cpp b/src/corelib/kernel/qjnionload.cpp deleted file mode 100644 index dbaee48ac6..0000000000 --- a/src/corelib/kernel/qjnionload.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qjnihelpers_p.h" - -#include <jni.h> -#include <android/log.h> - -static const char logTag[] = "QtCore"; - -Q_CORE_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) -{ - Q_UNUSED(reserved); - - static bool initialized = false; - if (initialized) - return JNI_VERSION_1_6; - initialized = true; - - typedef union { - JNIEnv *nenv; - void *venv; - } _JNIEnv; - - __android_log_print(ANDROID_LOG_INFO, logTag, "Start"); - - _JNIEnv uenv; - uenv.venv = 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; -} |