Works locally, let's see how it fares on CI

Author: grendello

src/native/clr/host/host.cc

@@ -23,6 +23,7 @@
 #include <runtime-base/dso-loader.hh>
 #include <runtime-base/jni-wrappers.hh>
 #include <runtime-base/logger.hh>
+#include <runtime-base/monodroid-dl.hh>
 #include <runtime-base/search.hh>
 #include <runtime-base/timing-internal.hh>
 #include <shared/log_types.hh>
@@ -432,6 +433,13 @@ void Host::Java_mono_android_Runtime_initInternal (
 		gettid ()
 	);
 
+	for (size_t i = 0; i < dso_jni_preloads_idx_count; i++) {
+		DSOCacheEntry &entry = dso_cache[dso_jni_preloads_idx[i]];
+		const std::string_view dso_name = MonodroidDl::get_dso_name (&entry);
+		log_debug (LOG_ASSEMBLY, "Preloading JNI shared library: {}", dso_name);
+		MonodroidDl::monodroid_dlopen (&entry, dso_name, RTLD_NOW);
+	}
+
 	struct JnienvInitializeArgs init = {};
 	init.javaVm                                         = jvm;
 	init.env                                            = env;

src/native/clr/include/runtime-base/monodroid-dl.hh

@@ -73,6 +73,7 @@ namespace xamarin::android
 			return find_dso_cache_entry_common<CacheKind::DSO> (hash);
 		}
 
+	public:
 		[[gnu::always_inline]]
 		static auto get_dso_name (const DSOCacheEntry *const dso) -> std::string_view
 		{
@@ -83,7 +84,6 @@ namespace xamarin::android
 			return &dso_names_data[dso->name_index];
 		}
 
-	public:
 		[[gnu::flatten]]
 		static auto monodroid_dlopen (DSOCacheEntry *dso, std::string_view const& name, int flags) noexcept -> void*
 		{

src/native/clr/include/xamarin-app.hh

@@ -348,6 +348,8 @@ extern "C" {
 	[[gnu::visibility("default")]] extern AssemblyStoreRuntimeData assembly_store;
 
 	[[gnu::visibility("default")]] extern DSOCacheEntry dso_cache[];
+	[[gnu::visibility("default")]] extern const uint dso_jni_preloads_idx_count;
+	[[gnu::visibility("default")]] extern const uint dso_jni_preloads_idx[];
 	[[gnu::visibility("default")]] extern DSOCacheEntry aot_dso_cache[];
 	[[gnu::visibility("default")]] extern const char dso_names_data[];
 	[[gnu::visibility("default")]] extern DSOApkEntry dso_apk_entries[];

src/native/clr/xamarin-app-stub/application_dso_stub.cc

@@ -127,6 +127,11 @@ DSOCacheEntry dso_cache[] = {
 	},
 };
 
+const uint dso_jni_preloads_idx_count = 1;
+const uint dso_jni_preloads_idx[1] = {
+	0
+};
+
 DSOCacheEntry aot_dso_cache[] = {
 	{
 		.hash = xamarin::android::xxhash::hash (fake_dso_name, sizeof(fake_dso_name) - 1),

src/native/common/include/runtime-base/dso-loader.hh

@@ -71,8 +71,6 @@ namespace xamarin::android {
 		}
 
 	private:
-		static auto load_jni_on_main_thread (std::string_view const& full_name, std::string const& undecorated_name) noexcept -> void*;
-
 		[[gnu::always_inline]]
 		static auto log_and_return (void *handle, std::string_view const& full_name) -> void*
 		{

src/native/common/runtime-base/CMakeLists.txt

@@ -2,7 +2,6 @@ set(LIB_NAME runtime-base-common)
 set(LIB_ALIAS xa::runtime-base-common)
 
 set(XA_RUNTIME_BASE_SOURCES
-  dso-loader.cc
   timing-internal.cc
 )
 add_clang_check_sources("${XA_RUNTIME_BASE_SOURCES}")

src/native/common/runtime-base/dso-loader.cc

@@ -1224,6 +1224,15 @@ MonodroidRuntime::create_and_initialize_domain (JNIEnv* env, jclass runtimeClass
                                                 bool force_preload_assemblies, bool have_split_apks) noexcept
 {
 	MonoDomain* domain = create_domain (env, runtimeApks, is_root_domain, have_split_apks);
+
+	for (size_t i = 0; i < dso_jni_preloads_idx_count; i++) {
+		DSOCacheEntry &entry = dso_cache[dso_jni_preloads_idx[i]];
+
+		log_debug (LOG_ASSEMBLY, "Preloading JNI shared library: {}", optional_string (entry.name));
+		char *err = nullptr;
+		MonodroidDl::monodroid_dlopen (&entry, entry.hash, entry.name, RTLD_NOW,  &err);
+	}
+
 	// Asserting this on desktop apparently breaks a Designer test
 	abort_unless (domain != nullptr, "Failed to create AppDomain");
 
@@ -1439,6 +1448,7 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl
 		log_debug (LOG_DEFAULT, "Using runtime path: {}", optional_string (AndroidSystem::get_runtime_libdir ()));
 	}
 
+
 	AndroidSystem::setup_process_args (runtimeApks);
 	mono_dl_fallback_register (MonodroidDl::monodroid_dlopen, MonodroidDl::monodroid_dlsym, nullptr, nullptr);
 

src/native/mono/monodroid/monodroid-glue.cc

@@ -145,6 +145,11 @@ DSOCacheEntry dso_cache[] = {
 	},
 };
 
+const uint dso_jni_preloads_idx_count = 1;
+const uint dso_jni_preloads_idx[1] = {
+  0
+};
+
 DSOCacheEntry aot_dso_cache[] = {
 	{
 		.hash = xamarin::android::xxhash::hash (fake_dso_name, sizeof(fake_dso_name) - 1),

src/native/mono/xamarin-app-stub/application_dso_stub.cc

@@ -341,6 +341,8 @@ MONO_API MONO_API_EXPORT AssemblyStoreSingleAssemblyRuntimeData assembly_store_b
 MONO_API MONO_API_EXPORT AssemblyStoreRuntimeData assembly_store;
 
 MONO_API MONO_API_EXPORT DSOCacheEntry dso_cache[];
+MONO_API MONO_API_EXPORT const uint dso_jni_preloads_idx_count;
+MONO_API MONO_API_EXPORT const uint dso_jni_preloads_idx[];
 MONO_API MONO_API_EXPORT DSOCacheEntry aot_dso_cache[];
 MONO_API MONO_API_EXPORT DSOApkEntry dso_apk_entries[];