From b3c6de8ae1117a44cff709d9971b2ee2e24f79a5 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 19 Mar 2025 14:58:15 -0400 Subject: [PATCH 1/2] [native/mono] Use mono_jit_thread_attach() TODO: what's the explanation? --- src/native/mono/monodroid/osbridge.cc | 2 +- src/native/mono/runtime-base/util.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/native/mono/monodroid/osbridge.cc b/src/native/mono/monodroid/osbridge.cc index 919506d3fda..9df349ba631 100644 --- a/src/native/mono/monodroid/osbridge.cc +++ b/src/native/mono/monodroid/osbridge.cc @@ -1010,7 +1010,7 @@ OSBridge::ensure_jnienv (void) JNIEnv *env; jvm->GetEnv ((void**)&env, JNI_VERSION_1_6); if (env == nullptr) { - mono_thread_attach (Util::get_current_domain (/* attach_thread_if_needed */ false)); + mono_jit_thread_attach (Util::get_current_domain (/* attach_thread_if_needed */ false)); jvm->GetEnv ((void**)&env, JNI_VERSION_1_6); } return env; diff --git a/src/native/mono/runtime-base/util.hh b/src/native/mono/runtime-base/util.hh index 33e9524703f..bbe3e996828 100644 --- a/src/native/mono/runtime-base/util.hh +++ b/src/native/mono/runtime-base/util.hh @@ -339,7 +339,7 @@ namespace xamarin::android // domain ret = mono_get_root_domain (); if (attach_thread_if_needed) { - mono_thread_attach (ret); + mono_jit_thread_attach (ret); } return ret; From 2a586d5988c14f6911baa7c854815be755963295 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 19 Mar 2025 15:59:48 -0400 Subject: [PATCH 2/2] Fix the build. Doh! --- src/native/mono/runtime-base/util.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/native/mono/runtime-base/util.hh b/src/native/mono/runtime-base/util.hh index bbe3e996828..a8447d9326a 100644 --- a/src/native/mono/runtime-base/util.hh +++ b/src/native/mono/runtime-base/util.hh @@ -36,6 +36,7 @@ static inline constexpr int FALSE = 0; #include #include #include +#include #include #include