Merge branch 'main' into llvm-generator-update

* main:
  [Xamarin.Android.Build.Tasks] per-RID assemblies & typemaps (dotnet#8164)
  [AndroidDependenciesTests] Test both manifest types (dotnet#8186)
  [AndroidDependenciesTests] Use platform-tools 34.0.4 (dotnet#8184)

Author: grendello

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 using NUnit.Framework;
@@ -16,11 +17,9 @@ public class AndroidDependenciesTests : BaseTest
 	{
 		[Test]
 		[NonParallelizable] // Do not run environment modifying tests in parallel.
-		public void InstallAndroidDependenciesTest ()
+		public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] string manifestType)
 		{
 			AssertCommercialBuild ();
-			// We need to grab the latest API level *before* changing env vars
-			var apiLevel = AndroidSdkResolver.GetMaxInstalledPlatform ();
 			var oldSdkPath = Environment.GetEnvironmentVariable ("TEST_ANDROID_SDK_PATH");
 			var oldJdkPath = Environment.GetEnvironmentVariable ("TEST_ANDROID_JDK_PATH");
 			try {
@@ -33,41 +32,48 @@ public void InstallAndroidDependenciesTest ()
 						Directory.Delete (path, recursive: true);
 					Directory.CreateDirectory (path);
 				}
-				var proj = new XamarinAndroidApplicationProject {
-					TargetSdkVersion = apiLevel.ToString (),
+
+				var proj = new XamarinAndroidApplicationProject ();
+				var buildArgs = new List<string> {
+					"AcceptAndroidSDKLicenses=true",
+					$"AndroidManifestType={manifestType}",
 				};
-				const string ExpectedPlatformToolsVersion = "34.0.3";
+				// When using the default Xamarin manifest, this test should fail if we can't install any of the defaults in Xamarin.Android.Tools.Versions.props
+				// When using the Google manifest, override the platform tools version to the one in their manifest as it only ever contains one version
+				if (manifestType == "GoogleV2") {
+					buildArgs.Add ($"AndroidSdkPlatformToolsVersion={GetCurrentPlatformToolsVersion ()}");
+				}
+
 				using (var b = CreateApkBuilder ()) {
 					b.CleanupAfterSuccessfulBuild = false;
 					string defaultTarget = b.Target;
 					b.Target = "InstallAndroidDependencies";
 					b.BuildLogFile = "install-deps.log";
-					Assert.IsTrue (b.Build (proj, parameters: new string [] {
-						"AcceptAndroidSDKLicenses=true",
-						"AndroidManifestType=GoogleV2",     // Need GoogleV2 so we can install API-32
-						$"AndroidSdkPlatformToolsVersion={ExpectedPlatformToolsVersion}",
-					}), "InstallAndroidDependencies should have succeeded.");
-					b.Target = defaultTarget;
-					b.BuildLogFile = "build.log";
-					Assert.IsTrue (b.Build (proj, true), "build should have succeeded.");
-					bool usedNewDir = b.LastBuildOutput.ContainsText ($"Output Property: _AndroidSdkDirectory={sdkPath}");
-					if (!usedNewDir) {
-						// Is this because the platform-tools version changed (again?!)
-						try {
-							var currentPlatformToolsVersion = GetCurrentPlatformToolsVersion ();
-							if (currentPlatformToolsVersion != ExpectedPlatformToolsVersion) {
-								Assert.Fail ($"_AndroidSdkDirectory not set to new SDK path `{sdkPath}`, *probably* because Google's repository has a newer platform-tools package!  " +
-										$"repository2-3.xml contains platform-tools {currentPlatformToolsVersion}; expected {ExpectedPlatformToolsVersion}!");
+					Assert.IsTrue (b.Build (proj, parameters: buildArgs.ToArray ()), "InstallAndroidDependencies should have succeeded.");
+
+					// When dependencies can not be resolved/installed a warning will be present in build output:
+					//    Dependency `platform-tools` should have been installed but could not be resolved.
+					var depFailedMessage = "should have been installed but could not be resolved";
+					bool failedToInstall = b.LastBuildOutput.ContainsText (depFailedMessage);
+					if (failedToInstall) {
+						var sb = new StringBuilder ();
+						foreach (var line in b.LastBuildOutput) {
+							if (line.Contains (depFailedMessage)) {
+								sb.AppendLine (line);
 							}
 						}
-						catch (Exception e) {
-							TestContext.WriteLine ($"Could not extract platform-tools version from repository2-3.xml: {e}");
-						}
+						Assert.Fail ($"A required dependency was not installed, warnings are listed below. Please check the task output in 'install-deps.log'.\n{sb.ToString ()}");
 					}
-					Assert.IsTrue (usedNewDir, $"_AndroidSdkDirectory was not set to new SDK path `{sdkPath}`.");
+
+					b.Target = defaultTarget;
+					b.BuildLogFile = "build.log";
+					Assert.IsTrue (b.Build (proj, true), "build should have succeeded.");
+					Assert.IsTrue ( b.LastBuildOutput.ContainsText ($"Output Property: _AndroidSdkDirectory={sdkPath}"),
+						$"_AndroidSdkDirectory was not set to new SDK path `{sdkPath}`. Please check the task output in 'install-deps.log'");
 					Assert.IsTrue (b.LastBuildOutput.ContainsText ($"Output Property: _JavaSdkDirectory={jdkPath}"),
-						$"_JavaSdkDirectory was not set to new JDK path `{jdkPath}`.");
-					Assert.IsTrue (b.LastBuildOutput.ContainsText ($"JavaPlatformJarPath={sdkPath}"), $"JavaPlatformJarPath did not contain new SDK path `{sdkPath}`.");
+						$"_JavaSdkDirectory was not set to new JDK path `{jdkPath}`. Please check the task output in 'install-deps.log'");
+					Assert.IsTrue (b.LastBuildOutput.ContainsText ($"JavaPlatformJarPath={sdkPath}"),
+						$"JavaPlatformJarPath did not contain new SDK path `{sdkPath}`. Please check the task output in 'install-deps.log'");
 				}
 			} finally {
 				Environment.SetEnvironmentVariable ("TEST_ANDROID_SDK_PATH", oldSdkPath);
@@ -89,7 +95,7 @@ static string GetCurrentPlatformToolsVersion ()
 
 			var revision    = platformToolsPackage.Element ("revision");
 
-			return $"{revision.Element ("major")}.{revision.Element ("minor")}.{revision.Element ("micro")}";
+			return $"{revision.Element ("major")?.Value}.{revision.Element ("minor")?.Value}.{revision.Element ("micro")?.Value}";
 		}
 
 		[Test]

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

@@ -536,6 +536,17 @@ public static string GetRelativePathForAndroidAsset (string assetsDirectory, ITa
 			return path;
 		}
 
+		public static AndroidTargetArch AbiToTargetArch (string abi)
+		{
+			return abi switch {
+				"armeabi-v7a" => AndroidTargetArch.Arm,
+				"arm64-v8a"   => AndroidTargetArch.Arm64,
+				"x86_64"      => AndroidTargetArch.X86_64,
+				"x86"         => AndroidTargetArch.X86,
+				_             => throw new NotSupportedException ($"Internal error: unsupported ABI '{abi}'")
+			};
+		}
+
 		public static string AbiToRid (string abi)
 		{
 			switch (abi) {
@@ -556,36 +567,6 @@ public static string AbiToRid (string abi)
 			}
 		}
 
-		public static AndroidTargetArch AbiToTargetArch (string abi)
-		{
-			switch (abi) {
-				case "arm64-v8a":
-					return AndroidTargetArch.Arm64;
-
-				case "armeabi-v7a":
-					return AndroidTargetArch.Arm;
-
-				case "x86":
-					return AndroidTargetArch.X86;
-
-				case "x86_64":
-					return AndroidTargetArch.X86_64;
-
-				default:
-					throw new InvalidOperationException ($"Internal error: unsupported ABI '{abi}'");
-			}
-		}
-
-		public static AndroidTargetArch GetTargetArch (ITaskItem asmItem)
-		{
-			string? abi = asmItem.GetMetadata ("Abi");
-			if (String.IsNullOrEmpty (abi)) {
-				return AndroidTargetArch.None;
-			}
-
-			return AbiToTargetArch (abi);
-		}
-
 		public static string ArchToRid (AndroidTargetArch arch)
 		{
 			return arch switch {
@@ -623,6 +604,16 @@ public static int ConvertSupportedOSPlatformVersionToApiLevel (string version)
 			return apiLevel;
 		}
 
+		public static AndroidTargetArch GetTargetArch (ITaskItem asmItem)
+		{
+			string? abi = asmItem.GetMetadata ("Abi");
+			if (String.IsNullOrEmpty (abi)) {
+				return AndroidTargetArch.None;
+			}
+
+			return AbiToTargetArch (abi);
+		}
+
 		static string GetToolsRootDirectoryRelativePath (string androidBinUtilsDirectory)
 		{
 			// We need to link against libc and libm, but since NDK is not in use, the linker won't be able to find the actual Android libraries.

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

@@ -113,7 +113,7 @@ public ReleaseGenerationState (string[] supportedAbis)
 					if (TempModulesAbiAgnostic == null) {
 						TempModulesAbiAgnostic = dict;
 					}
-					tempModules.Add (GeneratePackageManagerJava.GetAndroidTargetArchForAbi (abi), dict);
+					tempModules.Add (MonoAndroidHelper.AbiToTargetArch (abi), dict);
 				}
 
 				TempModules = new ReadOnlyDictionary<AndroidTargetArch, Dictionary<byte[], ModuleReleaseData>> (tempModules);