Fixes after 'main' branch changes

Author: grendello

src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs

@@ -29,6 +29,7 @@ public class GenerateMainAndroidManifest : AndroidTask
 	public bool Debug { get; set; }
 	public bool EmbedAssemblies { get; set; }
 	public bool EnableMarshalMethods { get; set; }
+	public bool EnableNativeRuntimeLinking { get; set; }
 	[Required]
 	public string IntermediateOutputDirectory { get; set; } = "";
 	public string []? ManifestPlaceholders { get; set; }
@@ -77,7 +78,7 @@ public override bool RunTask ()
 
 		// If we still need the NativeCodeGenState in the <GenerateNativeMarshalMethodSources> task because we're using marshal methods,
 		// we're going to transfer it to a new object that doesn't require holding open Cecil AssemblyDefinitions.
-		if (UseMarshalMethods) {
+		if (UseMarshalMethods || EnableNativeRuntimeLinking) {
 			var nativeCodeGenStateObject = MarshalMethodCecilAdapter.GetNativeCodeGenStateCollection (Log, nativeCodeGenStates);
 
 			Log.LogDebugMessage ($"Saving {nameof (NativeCodeGenStateObject)} to {nameof (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey)}");

src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs

@@ -21,6 +21,10 @@ public class GenerateNativeMarshalMethodSources : AndroidTask
 
 	public bool EnableMarshalMethods { get; set; }
 
+	public bool EnableNativeRuntimeLinking { get; set; }
+
+	public ITaskItem[] MonoComponents { get; set; } = [];
+
 	[Required]
 	public string EnvironmentOutputDirectory { get; set; } = "";
 
@@ -39,7 +43,7 @@ public override bool RunTask ()
 	{
 		NativeCodeGenStateCollection? nativeCodeGenStates = null;
 
-		if (EnableMarshalMethods) {
+		if (EnableMarshalMethods || EnableNativeRuntimeLinking) {
 			// Retrieve the stored NativeCodeGenStateCollection (and remove it from the cache)
 			nativeCodeGenStates = BuildEngine4.UnregisterTaskObjectAssemblyLocal<NativeCodeGenStateCollection> (
 				MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
@@ -58,7 +62,9 @@ void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
 		var targetAbi = abi.ToLowerInvariant ();
 		var targetArch = MonoAndroidHelper.AbiToTargetArch (abi);
 		var marshalMethodsBaseAsmFilePath = Path.Combine (EnvironmentOutputDirectory, $"marshal_methods.{targetAbi}");
+		var pinvokePreserveBaseAsmFilePath = EnableNativeRuntimeLinking ? Path.Combine (EnvironmentOutputDirectory, $"pinvoke_preserve.{targetAbi}") : null;
 		var marshalMethodsLlFilePath = $"{marshalMethodsBaseAsmFilePath}.ll";
+		var pinvokePreserveLlFilePath = pinvokePreserveBaseAsmFilePath != null ? $"{pinvokePreserveBaseAsmFilePath}.ll" : null;
 		var (assemblyCount, uniqueAssemblyNames) = GetAssemblyCountAndUniqueNames ();
 
 		MarshalMethodsNativeAssemblyGenerator marshalMethodsAsmGen;
@@ -80,6 +86,20 @@ void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
 			);
 		}
 
+		if (EnableNativeRuntimeLinking) {
+			var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, EnsureCodeGenState (nativeCodeGenStates, targetArch), MonoComponents);
+			LLVMIR.LlvmIrModule pinvokePreserveModule = pinvokePreserveGen.Construct ();
+			using var pinvokePreserveWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
+			try {
+				pinvokePreserveGen.Generate (pinvokePreserveModule, targetArch, pinvokePreserveWriter, pinvokePreserveLlFilePath!);
+			} catch {
+				throw;
+			} finally {
+				pinvokePreserveWriter.Flush ();
+				Files.CopyIfStreamChanged (pinvokePreserveWriter.BaseStream, pinvokePreserveLlFilePath!);
+			}
+		}
+
 		var marshalMethodsModule = marshalMethodsAsmGen.Construct ();
 		using var marshalMethodsWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
 

src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs

@@ -30,6 +30,7 @@ public override bool RunTask ()
 			// Write all the user assemblies
 			pkgmgr.WriteLine ("public class MonoPackageManager_Resources {");
 			pkgmgr.WriteLine ("\tpublic static String[] Assemblies = new String[]{");
+
 			pkgmgr.WriteLine ("\t\t/* We need to ensure that \"{0}\" comes first in this list. */", mainFileName);
 			pkgmgr.WriteLine ("\t\t\"" + mainFileName + "\",");
 			foreach (var assembly in ResolvedUserAssemblies) {
@@ -54,6 +55,7 @@ public override bool RunTask ()
 
 			// Only copy to the real location if the contents actually changed
 			var dest = Path.GetFullPath (Path.Combine (OutputDirectory, "MonoPackageManager_Resources.java"));
+
 			Files.CopyIfStreamChanged (pkgmgr.BaseStream, dest);
 		}
 

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -1645,6 +1645,7 @@ because xbuild doesn't support framework reference assemblies.
       Debug="$(AndroidIncludeDebugSymbols)"
       EmbedAssemblies="$(EmbedAssembliesIntoApk)"
       EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
+      EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
       IntermediateOutputDirectory="$(IntermediateOutputPath)"
       ManifestPlaceholders="$(AndroidManifestPlaceholders)"
       ManifestTemplate="$(_AndroidManifestAbs)"
@@ -1902,12 +1903,14 @@ because xbuild doesn't support framework reference assemblies.
       CustomBundleConfigFile="$(AndroidBundleConfigurationFile)"
       TargetsCLR="$(_AndroidUseCLR)"
       ProjectRuntimeConfigFilePath="$(ProjectRuntimeConfigFilePath)"
-      EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)">
+      >
   </GenerateNativeApplicationConfigSources>
 
   <GenerateNativeMarshalMethodSources
       EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       EnableManagedMarshalMethodsLookup="$(_AndroidUseManagedMarshalMethodsLookup)"
+      EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
+      MonoComponents="@(_MonoComponent)"
       EnvironmentOutputDirectory="$(IntermediateOutputPath)android"
       IntermediateOutputDirectory="$(IntermediateOutputPath)"
       ResolvedAssemblies="@(_ResolvedAssemblies)"
@@ -2033,7 +2036,7 @@ because xbuild doesn't support framework reference assemblies.
 	<_CompileToDalvikDependsOnTargets>
 		_CompileJava;
 		_CreateApplicationSharedLibraries;
-    _LinkNativeRuntime;
+		_LinkNativeRuntime;
 		_GetMonoPlatformJarPath;
 		_GetLibraryImports;
 		_SetProguardMappingFileProperty;