Both MonoVM and CoreCLR should work now

Author: grendello

src/native/clr/host/host.cc

@@ -147,7 +147,7 @@ auto Host::zip_scan_callback (std::string_view const& apk_path, int apk_fd, dyna
 		}
 	}
 
-	if (!entry_name.starts_with (Zip::lib_prefix) || !entry_name.ends_with (Constants::dso_suffix)) {
+	if (!AndroidSystem::is_embedded_dso_mode_enabled () || !entry_name.starts_with (Zip::lib_prefix) || !entry_name.ends_with (Constants::dso_suffix)) {
 		return false;
 	}
 
@@ -156,6 +156,14 @@ auto Host::zip_scan_callback (std::string_view const& apk_path, int apk_fd, dyna
 	hash_t name_hash = xxhash::hash (lib_name.data (), lib_name.length ());
 	log_debug (LOG_ASSEMBLY, "Library name is: {}; hash == 0x{:x}", lib_name, name_hash);
 
+	DSOApkEntry *apk_entry = MonodroidDl::find_dso_apk_entry (name_hash);
+	if (apk_entry == nullptr) {
+		return false;
+	}
+
+	log_debug (LOG_ASSEMBLY, "Found matching DSO APK entry");
+	apk_entry->fd = apk_fd;
+	apk_entry->offset = offset;
 	return false;
 }
 

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

@@ -84,6 +84,23 @@ namespace xamarin::android
 			return &dso_names_data[dso->name_index];
 		}
 
+		[[gnu::flatten]]
+		static auto find_dso_apk_entry (hash_t hash) -> DSOApkEntry*
+		{
+			auto equal = [](DSOApkEntry const& entry, hash_t key) -> bool { return entry.name_hash == key; };
+			auto less_than = [](DSOApkEntry const& entry, hash_t key) -> bool { return entry.name_hash < key; };
+			ssize_t idx = Search::binary_search<DSOApkEntry, equal, less_than> (
+				hash,
+				dso_apk_entries, application_config.number_of_shared_libraries
+			);
+
+			if (idx >= 0) [[likely]] {
+				return &dso_apk_entries[idx];
+			}
+
+			return nullptr;
+		}
+
 		[[gnu::flatten]]
 		static auto monodroid_dlopen (DSOCacheEntry *dso, std::string_view const& name, int flags) noexcept -> void*
 		{
@@ -107,18 +124,13 @@ namespace xamarin::android
 			StartupAwareLock lock (dso_handle_write_lock);
 #if defined (RELEASE)
 			if (AndroidSystem::is_embedded_dso_mode_enabled ()) {
-				DSOApkEntry *apk_entry = dso_apk_entries;
-				for (size_t i = 0uz; i < application_config.number_of_shared_libraries; i++) {
-					if (apk_entry->name_hash != dso->real_name_hash) {
-						apk_entry++;
-						continue;
-					}
-
+				DSOApkEntry *apk_entry = find_dso_apk_entry (dso->real_name_hash);
+				if (apk_entry != nullptr && apk_entry->fd != -1) {
 					dso->handle = DsoLoader::load (apk_entry->fd, apk_entry->offset, dso_name, flags, dso->is_jni_library);
-					if (dso->handle != nullptr) {
-						return dso->handle;
-					}
-					break;
+				}
+
+				if (dso->handle != nullptr) {
+					return dso->handle;
 				}
 			}
 #endif

src/native/mono/monodroid/embedded-assemblies-zip.cc

@@ -292,7 +292,7 @@ EmbeddedAssemblies::zip_load_assembly_store_entries (std::vector<uint8_t> const&
 		// Since it's not an assembly store, it's a shared library most likely and it is long enough for us not to have
 		// to check the length
 		if (Util::ends_with (entry_name, dso_suffix)) {
-			constexpr size_t apk_lib_prefix_len = apk_lib_prefix.size () - 1;
+			constexpr size_t apk_lib_prefix_len = apk_lib_prefix.length ();
 
 			const char *const name = entry_name.get () + apk_lib_prefix_len;
 			DSOApkEntry *apk_entry = reinterpret_cast<DSOApkEntry*>(reinterpret_cast<uint8_t*>(dso_apk_entries) + (sizeof(DSOApkEntry) * number_of_zip_dso_entries));