Use AndroidSdkResolver.GetJavaSdkPath () to get Jdk Path

Context: https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=4518058&view=logs&j=8100f0f7-e86c-5b6e-6a78-6808e1478ee9&t=b2ff00a9-cb72-5405-b714-ea139eccf107&l=482

    Failed CheckSignApk(True,False) [27 ms]
      Error Message:
       System.InvalidOperationException : Could not determine Java SDK location. Please provide `javaSdkPath`.
      Stack Trace:
         at Xamarin.Android.Tools.AndroidSdkInfo..ctor(Action`2 logger, String androidSdkPath, String androidNdkPath, String javaSdkPath) in /agent/_work/1/s/xamarin-android/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs:line 25
       at Xamarin.Android.Build.Tests.PackagingTest.CheckSignApk(Boolean useApkSigner, Boolean perAbiApk) in /agent/_work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs:line 366

The new Ubuntu test machines do not have JAVA_HOME set (or any other
fallback mechanism for locating the JDK).  When creating a new instance
of AndroidSdkInfo we should pass the JDK value used by the tests.  In
other cases, we can avoid creating an AndroidSdkInfo object entirely as
it was only being used to get a JDK path.

Author: pjcollins

.external

@@ -1,2 +1,2 @@
-xamarin/monodroid:pack-linux@ecfa7c781965d3fd4ea0b91c19f56a004a809a50
+xamarin/monodroid:main@ea2f34ad3acd4b32487fd55bb663d76d85774b1a
 mono/mono:2020-02@c66141a8c7ba2566c578c2dd012b2b723e006213

build-tools/automation/azure-pipelines.yaml

@@ -451,6 +451,11 @@ stages:
       parameters:
         version: $(DotNetCoreVersion)
 
+    - task: NuGetAuthenticate@0
+      displayName: authenticate with azure artifacts
+      inputs:
+        forceReinstallCredentialProvider: true
+
     - script: >
         sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF &&
         echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list &&
@@ -462,11 +467,6 @@ stages:
       inputs:
         versionSpec: 5.x
 
-    - task: NuGetAuthenticate@0
-      displayName: authenticate with azure artifacts
-      inputs:
-        forceReinstallCredentialProvider: true
-
     - script: make prepare-external-git-dependencies PREPARE_CI=1 CONFIGURATION=$(XA.Build.Configuration)
       workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
       displayName: make prepare-external-git-dependencies
@@ -498,6 +498,10 @@ stages:
         artifactName: nupkg-linux
         targetPath: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nupkg-linux
 
+    - script: dotnet tool update apkdiff -g
+      displayName: install apkdiff dotnet tool
+      continueOnError: true
+
     - template: yaml-templates/run-nunit-tests.yaml
       parameters:
         useDotNet: true

src/Xamarin.Android.Build.Tasks/Microsoft.NET.Workload.Android/WorkloadManifest.in.json

@@ -16,7 +16,6 @@
       "kind": "sdk",
       "version": "@SDK_PACK_VERSION@",
       "alias-to": {
-        "linux-x64": "Microsoft.Android.Sdk.linux-x64",
         "osx-x64": "Microsoft.Android.Sdk.osx-x64",
         "win-x64": "Microsoft.Android.Sdk.win-x64",
         "linux-x64": "Microsoft.Android.Sdk.linux-x64"

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

@@ -361,9 +361,7 @@ public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true,
 			string keyfile = Path.Combine (Root, "temp", TestName, "release.keystore");
 			if (File.Exists (keyfile))
 				File.Delete (keyfile);
-			var androidSdk = new AndroidSdkInfo ((level, message) => {
-			}, AndroidSdkPath, AndroidNdkPath);
-			string keyToolPath = Path.Combine (androidSdk.JavaSdkPath, "bin");
+			string keyToolPath = Path.Combine (AndroidSdkResolver.GetJavaSdkPath (), "bin");
 			var engine = new MockBuildEngine (Console.Out);
 			string pass = "Cy(nBW~j.&@B-!R_aq7/syzFR!S$4]7R%i6)R!";
 			string alias = "release store";

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

@@ -26,12 +26,7 @@ public void Setup()
 		{
 			engine = new MockBuildEngine (TestContext.Out, errors = new List<BuildErrorEventArgs> (), warnings = new List<BuildWarningEventArgs> (), messages = new List<BuildMessageEventArgs> ());
 			temp = Path.GetTempFileName ();
-
-			var androidSdk = new AndroidSdkInfo ((level, message) => {
-				if (level == TraceLevel.Error)
-					Assert.Fail (message);
-			}, AndroidSdkPath, AndroidNdkPath);
-			keyToolPath = Path.Combine (androidSdk.JavaSdkPath, "bin");
+			keyToolPath = Path.Combine (AndroidSdkResolver.GetJavaSdkPath (), "bin");
 		}
 
 		[TearDown]

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

@@ -33,7 +33,7 @@ public void TestNdkUtil ()
 			using (var builder = new Builder ()) {
 				var ndkDir = AndroidNdkPath;
 				var sdkDir = AndroidSdkPath;
-				MonoAndroidHelper.AndroidSdk = new AndroidSdkInfo ((arg1, arg2) => { }, sdkDir, ndkDir);
+				MonoAndroidHelper.AndroidSdk = new AndroidSdkInfo ((arg1, arg2) => { }, sdkDir, ndkDir, AndroidSdkResolver.GetJavaSdkPath ());
 				NdkUtil.Init (log, ndkDir);
 				var platforms = NdkUtil.GetSupportedPlatforms (log, ndkDir);
 				Assert.AreNotEqual (0, platforms.Count (), "No platforms found");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs

@@ -9,6 +9,7 @@
 using NUnit.Framework;
 using Xamarin.Android.Tasks;
 using Xamarin.Android.Tools;
+using Xamarin.ProjectTools;
 
 namespace Xamarin.Android.Build.Tests
 {
@@ -339,7 +340,7 @@ public static List<string> GatherEnvironmentFiles (string outputDirectoryRoot, s
 		public static void AssertValidEnvironmentSharedLibrary (string outputDirectoryRoot, string sdkDirectory, string ndkDirectory, string supportedAbis)
 		{
 			NdkUtil.Init (ndkDirectory);
-			MonoAndroidHelper.AndroidSdk = new AndroidSdkInfo ((arg1, arg2) => {}, sdkDirectory, ndkDirectory);
+			MonoAndroidHelper.AndroidSdk = new AndroidSdkInfo ((arg1, arg2) => {}, sdkDirectory, ndkDirectory, AndroidSdkResolver.GetJavaSdkPath ());
 
 			AndroidTargetArch arch;
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/JarContentBuilder.cs

@@ -32,9 +32,9 @@ public JarContentBuilder ()
 
 			var sdkPath = AndroidSdkResolver.GetAndroidSdkPath ();
 			var ndkPath = AndroidSdkResolver.GetAndroidNdkPath ();
-			var androidSdk = new AndroidSdkInfo (logger, androidSdkPath: sdkPath, androidNdkPath: ndkPath);
-			JavacFullPath = Path.Combine (androidSdk.JavaSdkPath, "bin", "javac");
-			JarFullPath = Path.Combine (androidSdk.JavaSdkPath, "bin", "jar");
+			var jdkPath = AndroidSdkResolver.GetJavaSdkPath ();
+			JavacFullPath = Path.Combine (jdkPath, "bin", "javac");
+			JarFullPath = Path.Combine (jdkPath, "bin", "jar");
 		}
 
 		public override byte [] Build ()

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/DexUtils.cs

@@ -110,7 +110,7 @@ static void DexDump (DataReceivedEventHandler handler, string dexFile, string an
 				if (l == TraceLevel.Error) {
 					throw new Exception (m);
 				}
-			}, androidSdkDirectory);
+			}, androidSdkDirectory, javaSdkPath: AndroidSdkResolver.GetJavaSdkPath ());
 			var buildToolsPath = androidSdk.GetBuildToolsPaths ().FirstOrDefault ();
 			if (string.IsNullOrEmpty (buildToolsPath)) {
 				throw new Exception ($"Unable to find build-tools in `{androidSdkDirectory}`!");