diff options
| author | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2022-01-26 23:40:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 23:40:40 -0800 |
| commit | 6604d88407b0ffe46b37d839e13d31f82086a517 (patch) | |
| tree | 51b46a86ee19c12069f4ac681bac8cc800b14fd4 | |
| parent | b7127a17bf2d946d3735db650f7e22cdcd0167d9 (diff) | |
| parent | 6a4614ef48aba0cdee4ed2aedf15b21170ecb4ed (diff) | |
Merge pull request #57277 from m4gr3d/fix_android_plugin_crash_master
Include the `godot_plugin_jni.cpp` file into the `platform/android/SCsub` file
| -rw-r--r-- | platform/android/SCsub | 1 | ||||
| -rw-r--r-- | platform/android/plugin/godot_plugin_jni.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index ecc72019e5..d031d14499 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -18,6 +18,7 @@ android_files = [ "jni_utils.cpp", "android_keys_utils.cpp", "display_server_android.cpp", + "plugin/godot_plugin_jni.cpp", "vulkan/vulkan_context_android.cpp", ] diff --git a/platform/android/plugin/godot_plugin_jni.cpp b/platform/android/plugin/godot_plugin_jni.cpp index 2207eec18d..48aeb3d070 100644 --- a/platform/android/plugin/godot_plugin_jni.cpp +++ b/platform/android/plugin/godot_plugin_jni.cpp @@ -126,7 +126,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitS env->DeleteLocalRef(j_param); }; - singleton->emit_signal(SNAME(signal_name), args, count); + singleton->emit_signal(StringName(signal_name), args, count); } JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterGDNativeLibraries(JNIEnv *env, jclass clazz, jobjectArray gdnlib_paths) { |