Use discovered runtime pack native lib dirs

Author: grendello

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets

@@ -92,7 +92,7 @@ They run in a context of an inner build with a single $(RuntimeIdentifier).
         Profiles="@(AndroidAotProfile)"
         StripLibraries="$(_AndroidAotStripLibraries)"
         ZipAlignmentPages="$(AndroidZipAlignment)"
-        RuntimePackLibraryDirectories="@(RuntimePackLibraryDirectory)">
+        RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)">
       <Output PropertyName="_Triple"     TaskParameter="Triple" />
       <Output PropertyName="_ToolPrefix" TaskParameter="ToolPrefix" />
       <Output PropertyName="_MsymPath"   TaskParameter="MsymPath" />

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

@@ -298,10 +298,12 @@ string GetLdFlags (NdkTools ndk, AndroidTargetArch arch, int level, string toolP
 				libs.Add (Path.Combine (androidLibPath, "libc.so"));
 				libs.Add (Path.Combine (androidLibPath, "libm.so"));
 			} else if (!UseAndroidNdk && EnableLLVM) {
-				string libstubsPath = MonoAndroidHelper.GetLibstubsArchDirectoryPath (RuntimePackLibraryDirectories, arch);
+				string? libstubsPath = MonoAndroidHelper.GetRuntimePackNativeLibDir (arch, RuntimePackLibraryDirectories);
 
-				libs.Add (Path.Combine (libstubsPath, "libc.so"));
-				libs.Add (Path.Combine (libstubsPath, "libm.so"));
+				if (!String.IsNullOrEmpty (libstubsPath)) {
+					libs.Add (Path.Combine (libstubsPath, "libc.so"));
+					libs.Add (Path.Combine (libstubsPath, "libm.so"));
+				}
 			}
 
 			if (libs.Count > 0) {

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

@@ -212,8 +212,7 @@ InputFiles GatherFilesForABI (string runtimeSharedLibrary, string abi, ITaskItem
 		{
 			AndroidTargetArch arch = MonoAndroidHelper.AbiToTargetArch (abi);
 			var libDirs = new HashSet<string> (StringComparer.OrdinalIgnoreCase) {
-				MonoAndroidHelper.GetNativeLibsRootDirectoryPath (Log, RuntimePackLibraryDirectories, arch),
-				MonoAndroidHelper.GetLibstubsArchDirectoryPath (RuntimePackLibraryDirectories, arch),
+				MonoAndroidHelper.GetRuntimePackNativeLibDir (arch, RuntimePackLibraryDirectories),
 			};
 
 			string RID = MonoAndroidHelper.AbiToRid (abi);

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

@@ -55,20 +55,19 @@ public Config (Dictionary<AndroidTargetArch, string> stubPaths, string androidBi
 	//
 	const ulong PayloadSectionAlignment = 0x4000;
 
-	public static Config GetConfig (TaskLoggingHelper log, string androidBinUtilsDirectory, ITaskItem[] runtimePacks, string baseOutputDirectory)
+	public static Config GetConfig (TaskLoggingHelper log, string androidBinUtilsDirectory, ITaskItem[] runtimePackLibraryDirs, string baseOutputDirectory)
 	{
 		var stubPaths = new Dictionary<AndroidTargetArch, string> ();
 
-		foreach (ITaskItem maybePack in runtimePacks) {
-			if (!MonoAndroidHelper.IsAndroidRuntimePack (maybePack, out string? packRID) || String.IsNullOrEmpty (packRID)) {
+		foreach (ITaskItem packLibDir in runtimePackLibraryDirs) {
+			string ?packRID = packLibDir.GetMetadata ("RuntimeIdentifier");
+			if (String.IsNullOrEmpty (packRID)) {
 				continue;
 			}
 
-			string packDir = MonoAndroidHelper.GetAndroidRuntimePackDir (maybePack);
-			string stubRelPath = Path.Combine ("runtimes", packRID, "native", StubFileName);
-			string stubPath = Path.Combine (packDir, stubRelPath);
+			string stubPath = Path.Combine (packLibDir.ItemSpec, StubFileName);
 			if (!File.Exists (stubPath)) {
-				throw new InvalidOperationException ($"Internal error: archive DSO stub file '{stubRelPath}' does not exist in runtime pack at {packDir}");
+				throw new InvalidOperationException ($"Internal error: archive DSO stub file '{stubPath}' does not exist in runtime pack at {packLibDir}");
 			}
 
 			AndroidTargetArch arch = MonoAndroidHelper.RidToArch (packRID);

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

@@ -570,67 +570,21 @@ static string GetToolsRootDirectoryRelativePath (string androidBinUtilsDirectory
 		}
 
 #if MSBUILD
-		public static bool IsAndroidRuntimePack (ITaskItem maybePack, out string? packRID)
+		public static string? GetRuntimePackNativeLibDir (AndroidTargetArch arch, IEnumerable<ITaskItem> runtimePackLibDirs)
 		{
-			string? framework = maybePack.GetMetadata ("FrameworkName");
-			if (String.IsNullOrEmpty (framework) || String.Compare ("Microsoft.Android", framework, StringComparison.Ordinal) != 0) {
-				packRID = null;
-				return false;
-			}
-
-			packRID = maybePack.GetMetadata ("RuntimeIdentifier");
-			return !String.IsNullOrEmpty (packRID);
-		}
-
-		public static string GetAndroidRuntimePackDir (ITaskItem pack)
-		{
-			return pack.GetMetadata ("PackageDirectory");
-		}
-
-		public static string GetAndroidRuntimePackNativeDir (ITaskItem[] runtimePacks, AndroidTargetArch arch)
-		{
-			string rid = ArchToRid (arch);
-			ITaskItem? androidRuntimePack = null;
-
-			foreach (ITaskItem pack in runtimePacks) {
-				if (!IsAndroidRuntimePack (pack, out string? packRID) || String.Compare (rid, packRID, StringComparison.OrdinalIgnoreCase) != 0) {
+			foreach (ITaskItem item in runtimePackLibDirs) {
+				string? rid = item.GetMetadata ("RuntimeIdentifier");
+				if (String.IsNullOrEmpty (rid)) {
 					continue;
 				}
 
-				androidRuntimePack = pack;
-				break;
-			}
-
-			if (androidRuntimePack == null) {
-				throw new InvalidOperationException ($"Internal error: Android runtime pack for architecture {arch} not found");
-			}
-
-			string? packageDir = GetAndroidRuntimePackDir (androidRuntimePack);
-			if (String.IsNullOrEmpty (packageDir)) {
-				throw new InvalidOperationException ($"Internal error: Android runtime pack for architecture {arch} is missing package directory metadata");
-			}
-
-			return Path.Combine (packageDir, "runtimes", rid, "native");
-		}
-
-		public static string GetLibstubsArchDirectoryPath (ITaskItem[] runtimePacks, AndroidTargetArch arch)
-		{
-			return GetAndroidRuntimePackNativeDir (runtimePacks, arch);
-		}
-
-		public static string GetDSOStubsRootDirectoryPath (ITaskItem[] runtimePacks, AndroidTargetArch arch)
-		{
-			return GetAndroidRuntimePackNativeDir (runtimePacks, arch);
-		}
-
-		public static string GetNativeLibsRootDirectoryPath (TaskLoggingHelper log, ITaskItem[] runtimePacks, AndroidTargetArch arch)
-		{
-			log.LogWarning ("Potential runtime packs:");
-			foreach (ITaskItem item in runtimePacks) {
-				log.LogWarning ($"  {item}");
+				AndroidTargetArch itemArch = RidToArch (rid);
+				if (itemArch == arch) {
+					return item.ItemSpec;
+				}
 			}
 
-			return GetAndroidRuntimePackNativeDir (runtimePacks, arch);
+			return null;
 		}
 #endif // MSBUILD
 

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

@@ -1474,7 +1474,7 @@ because xbuild doesn't support framework reference assemblies.
 
 <!-- _PrepareAssemblies lives in Microsoft.Android.Sdk.AssemblyResolution.targets -->
 
-<Target Name="_PrepareNativeAssemblySources" Condition=" '$(_AndroidRuntime)' == 'MonoVM' ">
+<Target Name="_PrepareNativeAssemblySources" Condition=" '$(_AndroidRuntime)' != 'CoreCLR' ">
   <PrepareAbiItems
       BuildTargetAbis="@(_BuildTargetAbis)"
       NativeSourcesDir="$(_NativeAssemblySourceDir)"
@@ -1776,7 +1776,7 @@ because xbuild doesn't support framework reference assemblies.
 </Target>
 
 <Target Name="_GeneratePackageManagerJava"
-  Condition=" '$(_AndroidRuntime)' == 'MonoVM' "
+  Condition=" '$(_AndroidRuntime)' != 'NativeAOT' "
   DependsOnTargets="$(_GeneratePackageManagerJavaDependsOn)"
   Inputs="@(_GeneratePackageManagerJavaInputs)"
   Outputs="$(_AndroidStampDirectory)_GeneratePackageManagerJava.stamp">
@@ -1998,7 +1998,7 @@ because xbuild doesn't support framework reference assemblies.
 
   <!-- Shrink Mono.Android.dll by removing attribute only needed for GenerateJavaStubs -->
   <RemoveRegisterAttribute
-    Condition="'$(AndroidLinkMode)' != 'None' and '$(AndroidIncludeDebugSymbols)' != 'true' and '$(AndroidStripILAfterAOT)' != 'true' and '$(_AndroidRuntime)' == 'MonoVM' "
+    Condition="'$(AndroidLinkMode)' != 'None' and '$(AndroidIncludeDebugSymbols)' != 'true' and '$(AndroidStripILAfterAOT)' != 'true' and '$(_AndroidRuntime)' != 'NativeAOT' "
     ShrunkFrameworkAssemblies="@(_ShrunkAssemblies)" />
 
   <MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)shrunk" />
@@ -2093,7 +2093,7 @@ because xbuild doesn't support framework reference assemblies.
       AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
       ZipAlignmentPages="$(AndroidZipAlignment)"
       TargetsCLR="$(_AndroidUseCLR)"
-      RuntimePackLibraryDirectories="@(RuntimePackLibraryDirectory)"
+      RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)"
   />
   <ItemGroup>
     <FileWrites Include="@(_ApplicationSharedLibrary)" />
@@ -2220,7 +2220,7 @@ because xbuild doesn't support framework reference assemblies.
       ResolvedAssemblies="@(_BuildApkAssembliesToAddToArchive)"
       SupportedAbis="@(_BuildTargetAbis)"
       UseAssemblyStore="$(AndroidUseAssemblyStore)"
-      RuntimePackLibraryDirectories="@(RuntimePackLibraryDirectory)">
+      RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)">
     <Output TaskParameter="WrappedAssemblies" ItemName="FilesToAddToArchive" />
   </WrapAssembliesAsSharedLibraries>
 
@@ -2247,7 +2247,7 @@ because xbuild doesn't support framework reference assemblies.
       IntermediateOutputPath="$(IntermediateOutputPath)"
       RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
       SupportedAbis="@(_BuildTargetAbis)"
-      RuntimePackLibraryDirectories="@(RuntimePackLibraryDirectory)">
+      RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)">
     <Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
   </CollectRuntimeConfigFilesForArchive>
 
@@ -2265,7 +2265,7 @@ because xbuild doesn't support framework reference assemblies.
       ZipAlignmentPages="$(AndroidZipAlignment)"
       AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
       IntermediateOutputPath="$(IntermediateOutputPath)"
-      RuntimePackLibraryDirectories="@(RuntimePackLibraryDirectory)">
+      RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)">
     <Output TaskParameter="OutputFiles" ItemName="ApkFiles" />
     <Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
     <Output TaskParameter="DSODirectoriesToDelete" ItemName="DSODirectoriesToDelete" />