Revert "Use Android shared library loader for JNI libraries (#10376)"

This reverts commit 064f23f.

We are seeing `dotnet new maui` projects fail to debug, as they appear
to be stuck in a loop on startup:

    08-22 11:39:14.148 W/monodroid-assembly(10269): Timeout while waiting for shared library '/data/user/0/com.companyname.mauiapp14/files/.__override__/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so' to load.
    08-22 11:39:17.155 W/monodroid-assembly(10269): Timeout while waiting for shared library '/data/app/~~Q5yyfDmzDqX9Z8UwQnLoFA==/com.companyname.mauiapp14-ZPk2_y6fT3b_3leM8xhcAw==/lib/arm64/libSystem.Security.Cryptography.Native.Android.so' to load.
    08-22 11:39:20.164 W/monodroid-assembly(10269): Timeout while waiting for shared library '/data/user/0/com.companyname.mauiapp14/files/.__override__/arm64-v8a/libSystem.Security.Cryptography.Native.Android' to load.
    08-22 11:39:23.172 W/monodroid-assembly(10269): Timeout while waiting for shared library '/data/app/~~Q5yyfDmzDqX9Z8UwQnLoFA==/com.companyname.mauiapp14-ZPk2_y6fT3b_3leM8xhcAw==/lib/arm64/libSystem.Security.Cryptography.Native.Android' to load.
    08-22 11:39:23.172 W/monodroid-assembly(10269): Shared library 'libSystem.Security.Cryptography.Native.Android' not loaded, p/invoke 'AndroidCryptoNative_SSLStreamInitialize' may fail
    08-22 11:39:23.172 F/monodroid-assembly(10269): Failed to load symbol 'AndroidCryptoNative_SSLStreamInitialize' from shared library 'libSystem.Security.Cryptography.Native.Android'
    08-22 11:39:26.187 W/monodroid-assembly(10269): Timeout while waiting for shared library '/data/user/0/com.companyname.mauiapp14/files/.__override__/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so' to load.
    08-22 11:39:29.190 W/monodroid-assembly(10269): Timeout while waiting for shared library '/data/app/~~Q5yyfDmzDqX9Z8UwQnLoFA==/com.companyname.mauiapp14-ZPk2_y6fT3b_3leM8xhcAw==/lib/arm64/libSystem.Security.Cryptography.Native.Android.so' to load.
    08-22 11:39:32.198 W/monodroid-assembly(10269): Timeout while waiting for shared library '/data/user/0/com.companyname.mauiapp14/files/.__override__/arm64-v8a/libSystem.Security.Cryptography.Native.Android' to load.
    repeating...

Author: jonathanpeppers

src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs

@@ -61,7 +61,6 @@ sealed class DSOCacheEntry
 			[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
 			public ulong real_name_hash;
 			public bool ignore;
-			public bool is_jni_library;
 
 			[NativeAssembler (UsesDataProvider = true)]
 			public string? name;
@@ -157,19 +156,14 @@ sealed class XamarinAndroidBundledAssembly
 		}
 		#pragma warning restore CS0649
 
-		sealed class DsoCacheState
-		{
-			public List<StructureInstance<DSOCacheEntry>> DsoCache = [];
-			public List<DSOCacheEntry> JniPreloadDSOs = [];
-			public List<StructureInstance<DSOCacheEntry>> AotDsoCache = [];
-		}
-
 		// Keep in sync with FORMAT_TAG in src/monodroid/jni/xamarin-app.hh
 		const ulong FORMAT_TAG = 0x00025E6972616D58; // 'Xmari^XY' where XY is the format version
 
 		SortedDictionary <string, string>? environmentVariables;
 		SortedDictionary <string, string>? systemProperties;
 		StructureInstance? application_config;
+		List<StructureInstance<DSOCacheEntry>>? dsoCache;
+		List<StructureInstance<DSOCacheEntry>>? aotDsoCache;
 		List<StructureInstance<XamarinAndroidBundledAssembly>>? xamarinAndroidBundledAssemblies;
 
 		StructureInfo? applicationConfigStructureInfo;
@@ -235,7 +229,7 @@ protected override void Construct (LlvmIrModule module)
 			};
 			module.Add (sysProps, stringGroupName: "sysprop", stringGroupComment: " System properties name:value pairs");
 
-			DsoCacheState dsoState = InitDSOCache ();
+			(dsoCache, aotDsoCache) = InitDSOCache ();
 			var app_cfg = new ApplicationConfig {
 				uses_mono_llvm = UsesMonoLLVM,
 				uses_mono_aot = UsesMonoAOT,
@@ -255,8 +249,8 @@ protected override void Construct (LlvmIrModule module)
 				number_of_assemblies_in_apk = (uint)NumberOfAssembliesInApk,
 				number_of_shared_libraries = (uint)NativeLibraries.Count,
 				bundled_assembly_name_width = (uint)BundledAssemblyNameWidth,
-				number_of_dso_cache_entries = (uint)dsoState.DsoCache.Count,
-				number_of_aot_cache_entries = (uint)dsoState.AotDsoCache.Count,
+				number_of_dso_cache_entries = (uint)dsoCache.Count,
+				number_of_aot_cache_entries = (uint)aotDsoCache.Count,
 				android_runtime_jnienv_class_token = (uint)AndroidRuntimeJNIEnvToken,
 				jnienv_initialize_method_token = (uint)JNIEnvInitializeToken,
 				jnienv_registerjninatives_method_token = (uint)JNIEnvRegisterJniNativesToken,
@@ -268,23 +262,13 @@ protected override void Construct (LlvmIrModule module)
 			application_config = new StructureInstance<ApplicationConfig> (applicationConfigStructureInfo, app_cfg);
 			module.AddGlobalVariable ("application_config", application_config);
 
-			var dso_cache = new LlvmIrGlobalVariable (dsoState.DsoCache, "dso_cache", LlvmIrVariableOptions.GlobalWritable) {
+			var dso_cache = new LlvmIrGlobalVariable (dsoCache, "dso_cache", LlvmIrVariableOptions.GlobalWritable) {
 				Comment = " DSO cache entries",
 				BeforeWriteCallback = HashAndSortDSOCache,
 			};
 			module.Add (dso_cache);
 
-			// This variable MUST be written after `dso_cache` since it relies on sorting performed by HashAndSortDSOCache
-			var dso_jni_preloads_idx = new LlvmIrGlobalVariable (new List<uint> (), "dso_jni_preloads_idx", LlvmIrVariableOptions.GlobalConstant) {
-				Comment = " Indices into dso_cache[] of DSO libraries to preload because of JNI use",
-				ArrayItemCount = (uint)dsoState.JniPreloadDSOs.Count,
-				BeforeWriteCallback = PopulatePreloadIndices,
-				BeforeWriteCallbackCallerState = dsoState,
-			};
-			module.AddGlobalVariable ("dso_jni_preloads_idx_count", dso_jni_preloads_idx.ArrayItemCount);
-			module.Add (dso_jni_preloads_idx);
-
-			var aot_dso_cache = new LlvmIrGlobalVariable (dsoState.AotDsoCache, "aot_dso_cache", LlvmIrVariableOptions.GlobalWritable) {
+			var aot_dso_cache = new LlvmIrGlobalVariable (aotDsoCache, "aot_dso_cache", LlvmIrVariableOptions.GlobalWritable) {
 				Comment = " AOT DSO cache entries",
 				BeforeWriteCallback = HashAndSortDSOCache,
 			};
@@ -346,36 +330,6 @@ void AddAssemblyStores (LlvmIrModule module)
 			module.Add (assembly_store);
 		}
 
-		void PopulatePreloadIndices (LlvmIrVariable variable, LlvmIrModuleTarget target, object? state)
-		{
-			var indices = variable.Value as List<uint>;
-			if (indices == null) {
-				throw new InvalidOperationException ($"Internal error: DSO preload indices list instance not present.");
-			}
-
-			var dsoState = state as DsoCacheState;
-			if (dsoState == null) {
-				throw new InvalidOperationException ($"Internal error: DSO state not present.");
-			}
-
-			foreach (DSOCacheEntry preload in dsoState.JniPreloadDSOs) {
-				int dsoIdx = dsoState.DsoCache.FindIndex (entry => {
-					if (entry.Instance == null) {
-						return false;
-					}
-
-					return entry.Instance.hash == preload.hash && entry.Instance.real_name_hash == preload.real_name_hash;
-				});
-
-				if (dsoIdx == -1) {
-					throw new InvalidOperationException ($"Internal error: DSO entry in JNI preload list not found in the DSO cache list.");
-				}
-
-				indices.Add ((uint)dsoIdx);
-			}
-			indices.Sort ();
-		}
-
 		void HashAndSortDSOCache (LlvmIrVariable variable, LlvmIrModuleTarget target, object? state)
 		{
 			var cache = variable.Value as List<StructureInstance<DSOCacheEntry>>;
@@ -404,9 +358,9 @@ void HashAndSortDSOCache (LlvmIrVariable variable, LlvmIrModuleTarget target, ob
 			});
 		}
 
-		DsoCacheState InitDSOCache ()
+		(List<StructureInstance<DSOCacheEntry>> dsoCache, List<StructureInstance<DSOCacheEntry>> aotDsoCache) InitDSOCache ()
 		{
-			var dsos = new List<(string name, string nameLabel, bool ignore, ITaskItem item)> ();
+			var dsos = new List<(string name, string nameLabel, bool ignore)> ();
 			var nameCache = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
 
 			foreach (ITaskItem item in NativeLibraries) {
@@ -420,37 +374,26 @@ DsoCacheState InitDSOCache ()
 					continue;
 				}
 
-				dsos.Add ((name, $"dsoName{dsos.Count.ToString (CultureInfo.InvariantCulture)}", ELFHelper.IsEmptyAOTLibrary (Log, item.ItemSpec), item));
+				dsos.Add ((name, $"dsoName{dsos.Count.ToString (CultureInfo.InvariantCulture)}", ELFHelper.IsEmptyAOTLibrary (Log, item.ItemSpec)));
 			}
 
 			var dsoCache = new List<StructureInstance<DSOCacheEntry>> ();
-			var jniPreloads = new List<DSOCacheEntry> ();
 			var aotDsoCache = new List<StructureInstance<DSOCacheEntry>> ();
 			var nameMutations = new List<string> ();
 
 			for (int i = 0; i < dsos.Count; i++) {
 				string name = dsos[i].name;
-
-				bool isJniLibrary = ELFHelper.IsJniLibrary (Log, dsos[i].item.ItemSpec);
-				bool ignore = dsos[i].ignore;
-
 				nameMutations.Clear();
 				AddNameMutations (name);
-
 				// All mutations point to the actual library name, but have hash of the mutated one
 				foreach (string entryName in nameMutations) {
 					var entry = new DSOCacheEntry {
 						HashedName = entryName,
 						hash = 0, // Hash is arch-specific, we compute it before writing
-						ignore = ignore,
-						is_jni_library = isJniLibrary,
+						ignore = dsos[i].ignore,
 						name = name,
 					};
 
-					if (entry.is_jni_library && entry.HashedName == name && !ApplicationConfigNativeAssemblyGeneratorCLR.DsoCacheJniPreloadIgnore.Contains (name)) {
-						jniPreloads.Add (entry);
-					}
-
 					var item = new StructureInstance<DSOCacheEntry> (dsoCacheEntryStructureInfo, entry);
 					if (name.StartsWith ("libaot-", StringComparison.OrdinalIgnoreCase)) {
 						aotDsoCache.Add (item);
@@ -460,11 +403,7 @@ DsoCacheState InitDSOCache ()
 				}
 			}
 
-			return new DsoCacheState {
-				DsoCache = dsoCache,
-				AotDsoCache = aotDsoCache,
-				JniPreloadDSOs = jniPreloads,
-			};
+			return (dsoCache, aotDsoCache);
 
 			void AddNameMutations (string name)
 			{

src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGeneratorCLR.cs

@@ -59,7 +59,6 @@ sealed class DSOCacheEntry
 		[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
 		public ulong real_name_hash;
 		public bool ignore;
-		public bool is_jni_library;
 
 		[NativeAssembler (UsesDataProvider = true)]
 		public uint name_index;
@@ -239,27 +238,15 @@ sealed class XamarinAndroidBundledAssembly
 	}
 #pragma warning restore CS0649
 
-	sealed class DsoCacheState
-	{
-		public List<StructureInstance<DSOCacheEntry>> DsoCache = [];
-		public List<DSOCacheEntry> JniPreloadDSOs = [];
-		public List<StructureInstance<DSOCacheEntry>> AotDsoCache = [];
-		public LlvmIrStringBlob NamesBlob = null!;
-	}
-
 	// Keep in sync with FORMAT_TAG in src/monodroid/jni/xamarin-app.hh
 	const ulong FORMAT_TAG = 0x00025E6972616D58; // 'Xmari^XY' where XY is the format version
 
-	// List of library names to ignore when generating the list of JNI-using libraries to preload
-	internal static readonly HashSet<string> DsoCacheJniPreloadIgnore = new (StringComparer.OrdinalIgnoreCase) {
-		"libmonodroid.so",
-	};
-
 	SortedDictionary <string, string>? environmentVariables;
 	SortedDictionary <string, string>? systemProperties;
 	SortedDictionary <string, string>? runtimeProperties;
 	StructureInstance? application_config;
-
+	List<StructureInstance<DSOCacheEntry>>? dsoCache;
+	List<StructureInstance<DSOCacheEntry>>? aotDsoCache;
 #pragma warning disable CS0649 // Field is never assigned to, and will always have its default value - assigned conditionally by build process
 	List<StructureInstance<XamarinAndroidBundledAssembly>>? xamarinAndroidBundledAssemblies;
 #pragma warning restore CS0649
@@ -274,10 +261,10 @@ sealed class DsoCacheState
 	StructureInfo? assemblyStoreRuntimeDataStructureInfo;
 	StructureInfo? runtimePropertyStructureInfo;
 	StructureInfo? runtimePropertyIndexEntryStructureInfo;
-#pragma warning disable CS0169 // Field is never used - might be used in future versions
+#pragma warning disable CS0169 // Field is never used - might be used in future versions  
 	StructureInfo? hostConfigurationPropertyStructureInfo;
 #pragma warning restore CS0169
-#pragma warning disable CS0169 // Field is never used - might be used in future versions
+#pragma warning disable CS0169 // Field is never used - might be used in future versions  
 	StructureInfo? hostConfigurationPropertiesStructureInfo;
 #pragma warning restore CS0169
 	StructureInfo? appEnvironmentVariableStructureInfo;
@@ -362,7 +349,7 @@ protected override void Construct (LlvmIrModule module)
 		};
 		module.Add (sysProps, stringGroupName: "sysprop", stringGroupComment: " System properties name:value pairs");
 
-		DsoCacheState dsoState = InitDSOCache ();
+		(dsoCache, aotDsoCache, LlvmIrStringBlob dsoNamesBlob) = InitDSOCache ();
 		var app_cfg = new ApplicationConfigCLR {
 			uses_assembly_preload = UsesAssemblyPreload,
 			jni_add_native_method_registration_attribute_present = JniAddNativeMethodRegistrationAttributePresent,
@@ -376,8 +363,8 @@ protected override void Construct (LlvmIrModule module)
 			number_of_assemblies_in_apk = (uint)NumberOfAssembliesInApk,
 			number_of_shared_libraries = (uint)NativeLibraries.Count,
 			bundled_assembly_name_width = (uint)BundledAssemblyNameWidth,
-			number_of_dso_cache_entries = (uint)dsoState.DsoCache.Count,
-			number_of_aot_cache_entries = (uint)dsoState.AotDsoCache.Count,
+			number_of_dso_cache_entries = (uint)dsoCache.Count,
+			number_of_aot_cache_entries = (uint)aotDsoCache.Count,
 			android_runtime_jnienv_class_token = (uint)AndroidRuntimeJNIEnvToken,
 			jnienv_initialize_method_token = (uint)JNIEnvInitializeToken,
 			jnienv_registerjninatives_method_token = (uint)JNIEnvRegisterJniNativesToken,
@@ -388,28 +375,18 @@ protected override void Construct (LlvmIrModule module)
 		application_config = new StructureInstance<ApplicationConfigCLR> (applicationConfigStructureInfo, app_cfg);
 		module.AddGlobalVariable ("application_config", application_config);
 
-		var dso_cache = new LlvmIrGlobalVariable (dsoState.DsoCache, "dso_cache", LlvmIrVariableOptions.GlobalWritable) {
+		var dso_cache = new LlvmIrGlobalVariable (dsoCache, "dso_cache", LlvmIrVariableOptions.GlobalWritable) {
 			Comment = " DSO cache entries",
 			BeforeWriteCallback = HashAndSortDSOCache,
 		};
 		module.Add (dso_cache);
 
-		// This variable MUST be written after `dso_cache` since it relies on sorting performed by HashAndSortDSOCache
-		var dso_jni_preloads_idx = new LlvmIrGlobalVariable (new List<uint> (), "dso_jni_preloads_idx", LlvmIrVariableOptions.GlobalConstant) {
-			Comment = " Indices into dso_cache[] of DSO libraries to preload because of JNI use",
-			ArrayItemCount = (uint)dsoState.JniPreloadDSOs.Count,
-			BeforeWriteCallback = PopulatePreloadIndices,
-			BeforeWriteCallbackCallerState = dsoState,
-		};
-		module.AddGlobalVariable ("dso_jni_preloads_idx_count", dso_jni_preloads_idx.ArrayItemCount);
-		module.Add (dso_jni_preloads_idx);
-
-		var aot_dso_cache = new LlvmIrGlobalVariable (dsoState.AotDsoCache, "aot_dso_cache", LlvmIrVariableOptions.GlobalWritable) {
+		var aot_dso_cache = new LlvmIrGlobalVariable (aotDsoCache, "aot_dso_cache", LlvmIrVariableOptions.GlobalWritable) {
 			Comment = " AOT DSO cache entries",
 			BeforeWriteCallback = HashAndSortDSOCache,
 		};
 		module.Add (aot_dso_cache);
-		module.AddGlobalVariable ("dso_names_data", dsoState.NamesBlob, LlvmIrVariableOptions.GlobalConstant);
+		module.AddGlobalVariable ("dso_names_data", dsoNamesBlob, LlvmIrVariableOptions.GlobalConstant);
 
 		var dso_apk_entries = new LlvmIrGlobalVariable (typeof(List<StructureInstance<DSOApkEntry>>), "dso_apk_entries") {
 			ArrayItemCount = (ulong)NativeLibraries.Count,
@@ -566,36 +543,6 @@ void AddAssemblyStores (LlvmIrModule module)
 		module.Add (assembly_store);
 	}
 
-	void PopulatePreloadIndices (LlvmIrVariable variable, LlvmIrModuleTarget target, object? state)
-	{
-		var indices = variable.Value as List<uint>;
-		if (indices == null) {
-			throw new InvalidOperationException ($"Internal error: DSO preload indices list instance not present.");
-		}
-
-		var dsoState = state as DsoCacheState;
-		if (dsoState == null) {
-			throw new InvalidOperationException ($"Internal error: DSO state not present.");
-		}
-
-		foreach (DSOCacheEntry preload in dsoState.JniPreloadDSOs) {
-			int dsoIdx = dsoState.DsoCache.FindIndex (entry => {
-				if (entry.Instance == null) {
-					return false;
-				}
-
-				return entry.Instance.hash == preload.hash && entry.Instance.real_name_hash == preload.real_name_hash;
-			});
-
-			if (dsoIdx == -1) {
-				throw new InvalidOperationException ($"Internal error: DSO entry in JNI preload list not found in the DSO cache list.");
-			}
-
-			indices.Add ((uint)dsoIdx);
-		}
-		indices.Sort ();
-	}
-
 	void HashAndSortDSOCache (LlvmIrVariable variable, LlvmIrModuleTarget target, object? state)
 	{
 		var cache = variable.Value as List<StructureInstance<DSOCacheEntry>>;
@@ -624,9 +571,10 @@ void HashAndSortDSOCache (LlvmIrVariable variable, LlvmIrModuleTarget target, ob
 		});
 	}
 
-	DsoCacheState InitDSOCache ()
+	(List<StructureInstance<DSOCacheEntry>> dsoCache, List<StructureInstance<DSOCacheEntry>> aotDsoCache, LlvmIrStringBlob namesBlob)
+	InitDSOCache ()
 	{
-		var dsos = new List<(string name, string nameLabel, bool ignore, ITaskItem item)> ();
+		var dsos = new List<(string name, string nameLabel, bool ignore)> ();
 		var nameCache = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
 
 		foreach (ITaskItem item in NativeLibraries) {
@@ -640,11 +588,10 @@ DsoCacheState InitDSOCache ()
 				continue;
 			}
 
-			dsos.Add ((name, $"dsoName{dsos.Count.ToString (CultureInfo.InvariantCulture)}", ELFHelper.IsEmptyAOTLibrary (Log, item.ItemSpec), item));
+			dsos.Add ((name, $"dsoName{dsos.Count.ToString (CultureInfo.InvariantCulture)}", ELFHelper.IsEmptyAOTLibrary (Log, item.ItemSpec)));
 		}
 
 		var dsoCache = new List<StructureInstance<DSOCacheEntry>> ();
-		var jniPreloads = new List<DSOCacheEntry> ();
 		var aotDsoCache = new List<StructureInstance<DSOCacheEntry>> ();
 		var nameMutations = new List<string> ();
 		var dsoNamesBlob = new LlvmIrStringBlob ();
@@ -653,9 +600,6 @@ DsoCacheState InitDSOCache ()
 			string name = dsos[i].name;
 			(int nameOffset, _) = dsoNamesBlob.Add (name);
 
-			bool isJniLibrary = ELFHelper.IsJniLibrary (Log, dsos[i].item.ItemSpec);
-			bool ignore = dsos[i].ignore;
-
 			nameMutations.Clear();
 			AddNameMutations (name);
 			// All mutations point to the actual library name, but have hash of the mutated one
@@ -665,15 +609,10 @@ DsoCacheState InitDSOCache ()
 					RealName = name,
 
 					hash = 0, // Hash is arch-specific, we compute it before writing
-					ignore = ignore,
-					is_jni_library = isJniLibrary,
+					ignore = dsos[i].ignore,
 					name_index = (uint)nameOffset,
 				};
 
-				if (entry.is_jni_library && entry.HashedName == name && !DsoCacheJniPreloadIgnore.Contains (name)) {
-					jniPreloads.Add (entry);
-				}
-
 				var item = new StructureInstance<DSOCacheEntry> (dsoCacheEntryStructureInfo, entry);
 				if (name.StartsWith ("libaot-", StringComparison.OrdinalIgnoreCase)) {
 					aotDsoCache.Add (item);
@@ -683,12 +622,7 @@ DsoCacheState InitDSOCache ()
 			}
 		}
 
-		return new DsoCacheState {
-			DsoCache = dsoCache,
-			JniPreloadDSOs = jniPreloads,
-			AotDsoCache = aotDsoCache,
-			NamesBlob = dsoNamesBlob,
-		};
+		return (dsoCache, aotDsoCache, dsoNamesBlob);
 
 		void AddNameMutations (string name)
 		{