Address feedback

grendello · grendello · commit 48ccc6e83519 · 2025-07-11T16:58:54.000+02:00
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
@@ -78,26 +78,37 @@ void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
 			_ => throw new NotSupportedException ($"Internal error: unsupported runtime type '{androidRuntime}'")
 		};
 
+		bool fileFullyWritten;
 		if (EnableNativeRuntimeLinking) {
 			var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, EnsureCodeGenState (nativeCodeGenStates, targetArch), MonoComponents);
 			LLVMIR.LlvmIrModule pinvokePreserveModule = pinvokePreserveGen.Construct ();
 			using var pinvokePreserveWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
+			fileFullyWritten = false;
 			try {
 				pinvokePreserveGen.Generate (pinvokePreserveModule, targetArch, pinvokePreserveWriter, pinvokePreserveLlFilePath!);
-			} finally {
 				pinvokePreserveWriter.Flush ();
 				Files.CopyIfStreamChanged (pinvokePreserveWriter.BaseStream, pinvokePreserveLlFilePath!);
+				fileFullyWritten = true;
+			} finally {
+				if (!fileFullyWritten) {
+					MonoAndroidHelper.LogTextStreamContents (Log, $"Partial contents of file '{pinvokePreserveLlFilePath}'", pinvokePreserveWriter.BaseStream);
+				}
 			}
 		}
 
 		var marshalMethodsModule = marshalMethodsAsmGen.Construct ();
 		using var marshalMethodsWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
 
+		fileFullyWritten = false;
 		try {
 			marshalMethodsAsmGen.Generate (marshalMethodsModule, targetArch, marshalMethodsWriter, marshalMethodsLlFilePath);
-		} finally {
 			marshalMethodsWriter.Flush ();
 			Files.CopyIfStreamChanged (marshalMethodsWriter.BaseStream, marshalMethodsLlFilePath);
+			fileFullyWritten = true;
+		} finally {
+			if (!fileFullyWritten) {
+				MonoAndroidHelper.LogTextStreamContents (Log, $"Partial contents of file '{marshalMethodsLlFilePath}'", marshalMethodsWriter.BaseStream);
+			}
 		}
 
 		MarshalMethodsNativeAssemblyGenerator MakeMonoGenerator ()
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs
@@ -107,6 +107,8 @@ public override bool RunTask ()
 
 				if (!IgnoreLibraryWhenLinkingRuntime (library)) {
 					output.Add (library);
+				} else {
+					Log.LogDebugMessage ($"Ignoring '{library.ItemSpec}'");
 				}
 			}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
@@ -804,5 +804,16 @@ public static JavaPeerStyle ParseCodeGenerationTarget (string codeGenerationTarg
 		}
 
 		public static object GetProjectBuildSpecificTaskObjectKey (object key, string workingDirectory, string intermediateOutputPath) => (key, workingDirectory, intermediateOutputPath);
+
+		public static void LogTextStreamContents (TaskLoggingHelper log, string message, Stream stream)
+		{
+			if (stream.CanSeek) {
+				stream.Seek (0, SeekOrigin.Begin);
+			}
+
+			using var reader = new StreamReader (stream, Encoding.UTF8, detectEncodingFromByteOrderMarks: false, bufferSize: -1, leaveOpen: true);
+			log.LogDebugMessage (message);
+			log.LogDebugMessage (reader.ReadToEnd ());
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ public override bool RunTask ()`
`107`	`107`
`108`	`108`	`if (!IgnoreLibraryWhenLinkingRuntime (library)) {`
`109`	`109`	`output.Add (library);`
	`110`	`+ } else {`
	`111`	`+ Log.LogDebugMessage ($"Ignoring '{library.ItemSpec}'");`
`110`	`112`	`}`
`111`	`113`	`}`
`112`	`114`
Original file line number	Diff line number	Diff line change
`@@ -804,5 +804,16 @@ public static JavaPeerStyle ParseCodeGenerationTarget (string codeGenerationTarg`
`804`	`804`	`}`
`805`	`805`
`806`	`806`	`public static object GetProjectBuildSpecificTaskObjectKey (object key, string workingDirectory, string intermediateOutputPath) => (key, workingDirectory, intermediateOutputPath);`
	`807`	`+`
	`808`	`+ public static void LogTextStreamContents (TaskLoggingHelper log, string message, Stream stream)`
	`809`	`+ {`
	`810`	`+ if (stream.CanSeek) {`
	`811`	`+ stream.Seek (0, SeekOrigin.Begin);`
	`812`	`+ }`
	`813`	`+`
	`814`	`+ using var reader = new StreamReader (stream, Encoding.UTF8, detectEncodingFromByteOrderMarks: false, bufferSize: -1, leaveOpen: true);`
	`815`	`+ log.LogDebugMessage (message);`
	`816`	`+ log.LogDebugMessage (reader.ReadToEnd ());`
	`817`	`+ }`
`807`	`818`	`}`
`808`	`819`	`}`