summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-11-01 05:45:13 +0100
committerCharles Lombardo <clombardo169@gmail.com>2023-11-01 19:41:19 +0100
commit92418e909f7bb3d2c199b9392304f4bd1dea65bc (patch)
treed26f391569b105fc5c88305109696bbf515cf6f0 /src
parentMerge pull request #11934 from zhaobot/tx-update-20231101020822 (diff)
downloadyuzu-92418e909f7bb3d2c199b9392304f4bd1dea65bc.tar
yuzu-92418e909f7bb3d2c199b9392304f4bd1dea65bc.tar.gz
yuzu-92418e909f7bb3d2c199b9392304f4bd1dea65bc.tar.bz2
yuzu-92418e909f7bb3d2c199b9392304f4bd1dea65bc.tar.lz
yuzu-92418e909f7bb3d2c199b9392304f4bd1dea65bc.tar.xz
yuzu-92418e909f7bb3d2c199b9392304f4bd1dea65bc.tar.zst
yuzu-92418e909f7bb3d2c199b9392304f4bd1dea65bc.zip
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt4
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt34
-rw-r--r--src/android/app/src/main/jni/CMakeLists.txt1
-rw-r--r--src/android/app/src/main/jni/native_log.cpp31
4 files changed, 39 insertions, 31 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
index 07f1b4842..ed8fe6c3f 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
@@ -462,12 +462,12 @@ object NativeLibrary {
}
fun setEmulationActivity(emulationActivity: EmulationActivity?) {
- Log.verbose("[NativeLibrary] Registering EmulationActivity.")
+ Log.debug("[NativeLibrary] Registering EmulationActivity.")
sEmulationActivity = WeakReference(emulationActivity)
}
fun clearEmulationActivity() {
- Log.verbose("[NativeLibrary] Unregistering EmulationActivity.")
+ Log.debug("[NativeLibrary] Unregistering EmulationActivity.")
sEmulationActivity.clear()
}
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt
index a193e82a4..1d3c7dce3 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt
@@ -3,38 +3,14 @@
package org.yuzu.yuzu_emu.utils
-import android.util.Log
-import org.yuzu.yuzu_emu.BuildConfig
-
-/**
- * Contains methods that call through to [android.util.Log], but
- * with the same TAG automatically provided. Also no-ops VERBOSE and DEBUG log
- * levels in release builds.
- */
object Log {
- private const val TAG = "Yuzu Frontend"
-
- fun verbose(message: String) {
- if (BuildConfig.DEBUG) {
- Log.v(TAG, message)
- }
- }
+ external fun debug(message: String)
- fun debug(message: String) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, message)
- }
- }
+ external fun warning(message: String)
- fun info(message: String) {
- Log.i(TAG, message)
- }
+ external fun info(message: String)
- fun warning(message: String) {
- Log.w(TAG, message)
- }
+ external fun error(message: String)
- fun error(message: String) {
- Log.e(TAG, message)
- }
+ external fun critical(message: String)
}
diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt
index 1c36661f5..88a570f68 100644
--- a/src/android/app/src/main/jni/CMakeLists.txt
+++ b/src/android/app/src/main/jni/CMakeLists.txt
@@ -18,6 +18,7 @@ add_library(yuzu-android SHARED
native_config.cpp
uisettings.cpp
game_metadata.cpp
+ native_log.cpp
)
set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR})
diff --git a/src/android/app/src/main/jni/native_log.cpp b/src/android/app/src/main/jni/native_log.cpp
new file mode 100644
index 000000000..33d691dc8
--- /dev/null
+++ b/src/android/app/src/main/jni/native_log.cpp
@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <common/logging/log.h>
+#include <jni.h>
+
+#include "android_common/android_common.h"
+
+extern "C" {
+
+void Java_org_yuzu_yuzu_1emu_utils_Log_debug(JNIEnv* env, jobject obj, jstring jmessage) {
+ LOG_DEBUG(Frontend, "{}", GetJString(env, jmessage));
+}
+
+void Java_org_yuzu_yuzu_1emu_utils_Log_warning(JNIEnv* env, jobject obj, jstring jmessage) {
+ LOG_WARNING(Frontend, "{}", GetJString(env, jmessage));
+}
+
+void Java_org_yuzu_yuzu_1emu_utils_Log_info(JNIEnv* env, jobject obj, jstring jmessage) {
+ LOG_INFO(Frontend, "{}", GetJString(env, jmessage));
+}
+
+void Java_org_yuzu_yuzu_1emu_utils_Log_error(JNIEnv* env, jobject obj, jstring jmessage) {
+ LOG_ERROR(Frontend, "{}", GetJString(env, jmessage));
+}
+
+void Java_org_yuzu_yuzu_1emu_utils_Log_critical(JNIEnv* env, jobject obj, jstring jmessage) {
+ LOG_CRITICAL(Frontend, "{}", GetJString(env, jmessage));
+}
+
+} // extern "C"