Fixlet + register scan results

dotnet · Jun 27, 2024 · 9fc5594 · 9fc5594
1 parent 482159f
commit 9fc5594
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
@@ -199,9 +199,12 @@ void Run (bool useMarshalMethods)
 					return;
 				}
 
-				(success, List<PinvokeScanner.PinvokeEntryInfo> pinfos) = ScanForUsedPinvokes (scanner, arch, state.Resolver);
-				if (!success) {
-					return;
+				if (EnableNativeRuntimeLinking) {
+					(success, List<PinvokeScanner.PinvokeEntryInfo> pinfos) = ScanForUsedPinvokes (scanner, arch, state.Resolver);
+					if (!success) {
+						return;
+					}
+					BuildEngine4.RegisterTaskObjectAssemblyLocal (ProjectSpecificTaskObjectKey (PinvokeScanner.PinvokesInfoRegisterTaskKey), pinfos, RegisteredTaskObjectLifetime.Build);
 				}
 
 				if (generateJavaCode) {
@@ -357,10 +360,10 @@ IList<string> MergeManifest (NativeCodeGenState codeGenState, Dictionary<string,
 			return additionalProviders;
 		}
 
-		(bool success, List<PinvokeScanner.PinvokeEntryInfo> pinfos) ScanForUsedPinvokes (PinvokeScanner scanner, AndroidTargetArch arch, XAAssemblyResolver resolver)
+		(bool success, List<PinvokeScanner.PinvokeEntryInfo>? pinfos) ScanForUsedPinvokes (PinvokeScanner scanner, AndroidTargetArch arch, XAAssemblyResolver resolver)
 		{
 			if (!EnableNativeRuntimeLinking) {
-				return;
+				return (true, null);
 			}
 
 			var frameworkAssemblies = new List<ITaskItem> ();

diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/PinvokeScanner.cs b/src/Xamarin.Android.Build.Tasks/Utilities/PinvokeScanner.cs
@@ -14,6 +14,8 @@ namespace Xamarin.Android.Tasks;
 
 class PinvokeScanner
 {
+	public const string PinvokesInfoRegisterTaskKey = ".:!PreservePinvokesTaskKey!:.";
+
 	public sealed class PinvokeEntryInfo
 	{
 		public readonly string LibraryName;