Load embedded assembly store also in filesystem mode

Author: grendello

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

@@ -266,7 +266,7 @@ EmbeddedAssemblies::zip_load_assembly_store_entries (std::span<uint8_t> const& b
 	dynamic_local_string<SENSIBLE_PATH_MAX> entry_name;
 	bool assembly_store_found = embedded_assembly_store_size != 0;
 	if (assembly_store_found) {
-		verify_assembly_store_and_set_info (embedded_assembly_store, "embedded");
+		load_embedded_assembly_store ();
 		log_debug (LOG_ASSEMBLY, "Looking for DSOs in APK");
 	} else {
 		log_debug (LOG_ASSEMBLY, "Looking for assembly store ('%s') and DSOs in APK", assembly_store_file_path.data ());

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

@@ -1405,13 +1405,21 @@ EmbeddedAssemblies::register_from_filesystem (const char *lib_dir_path,bool look
 size_t
 EmbeddedAssemblies::register_from_filesystem (monodroid_should_register should_register) noexcept
 {
-	log_debug (LOG_ASSEMBLY, "Registering assemblies from the filesystem"sv);
-	constexpr bool LookForMangledNames = true;
-	size_t assembly_count = register_from_filesystem (
-		AndroidSystem::app_lib_directories[0],
-		LookForMangledNames,
-		should_register
-	);
+	size_t assembly_count;
+
+	if (embedded_assembly_store_size > 0) {
+		log_debug (LOG_ASSEMBLY, "Filesystem mode, but registering assemblies from the embedded assembly store");
+		load_embedded_assembly_store ();
+		assembly_count = assembly_store.assembly_count;
+	} else {
+		log_debug (LOG_ASSEMBLY, "Registering assemblies from the filesystem");
+		constexpr bool LookForMangledNames = true;
+		assembly_count = register_from_filesystem (
+			AndroidSystem::app_lib_directories[0],
+			LookForMangledNames,
+			should_register
+		);
+	}
 
 #if defined(DEBUG)
 	constexpr bool DoNotLookForMangledNames = false;
@@ -1423,6 +1431,6 @@ EmbeddedAssemblies::register_from_filesystem (monodroid_should_register should_r
 	);
 #endif
 
-	log_debug (LOG_ASSEMBLY, "Found {} assemblies on the filesystem", assembly_count);
+	log_debug (LOG_ASSEMBLY, "Found %zu assemblies", assembly_count);
 	return assembly_count;
 }

src/native/mono/monodroid/embedded-assemblies.hh

@@ -417,6 +417,12 @@ namespace xamarin::android::internal {
 		void set_debug_entry_data (XamarinAndroidBundledAssembly &entry, ZipEntryLoadState const& state, dynamic_local_string<SENSIBLE_PATH_MAX> const& entry_name) noexcept;
 
 		void verify_assembly_store_and_set_info (void *data_start, const char *name) noexcept;
+
+		void load_embedded_assembly_store () noexcept
+		{
+			verify_assembly_store_and_set_info (embedded_assembly_store, "embedded");
+		}
+
 		void map_assembly_store (dynamic_local_string<SENSIBLE_PATH_MAX> const& entry_name, ZipEntryLoadState &state) noexcept;
 		const AssemblyStoreIndexEntry* find_assembly_store_entry (hash_t hash, const AssemblyStoreIndexEntry *entries, size_t entry_count) noexcept;
 		void store_individual_assembly_data (dynamic_local_string<SENSIBLE_PATH_MAX> const& entry_name, ZipEntryLoadState const& state, monodroid_should_register should_register) noexcept;

src/native/mono/runtime-base/monodroid-dl.hh

@@ -48,11 +48,11 @@ namespace xamarin::android::internal
 			size_t arr_size;
 
 			if constexpr (WhichCache == CacheKind::AOT) {
-				log_debug (LOG_ASSEMBLY, "Looking for hash {:x} in AOT cache", hash);
+				log_debug (LOG_ASSEMBLY, "Looking for hash 0x%zx in AOT cache", hash);
 				arr = aot_dso_cache;
 				arr_size = application_config.number_of_aot_cache_entries;
 			} else if constexpr (WhichCache == CacheKind::DSO) {
-				log_debug (LOG_ASSEMBLY, "Looking for hash {:x} in DSO cache", hash);
+				log_debug (LOG_ASSEMBLY, "Looking for hash 0x%zx in DSO cache", hash);
 				arr = dso_cache;
 				arr_size = application_config.number_of_dso_cache_entries;
 			}