Bump to xamarin/xamarin-android-tools:master@917d3b3c

Context: https://paper.dropbox.com/doc/OpenJDK-and-You--AH1yWKdVXgno~uXYfmcUAZTwAg-NoECAe2XkBQeoxFfGL6ea
Context: dotnet/android-tools#29 (comment)

Fixes: http://work.devdiv.io/646086
Fixes: http://work.devdiv.io/652760
Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/597752
Fixes: dotnet/android-tools#26
Fixes: dotnet/android-tools#39

Update & export `%JAVA_HOME%`, `%PATH%` on Windows.

Author: jonpryor

build-tools/scripts/Packaging.mk

@@ -66,10 +66,8 @@ package-deb: $(ZIP_OUTPUT)
 _TEST_ERRORS_BASENAME   = xa-test-errors-v$(PRODUCT_VERSION).$(-num-commits-since-version-change)_$(OS_NAME)-$(OS_ARCH)_$(GIT_BRANCH)_$(GIT_COMMIT)
 
 "$(_TEST_ERRORS_BASENAME).zip" package-test-errors:
-ifneq ($(wildcard bin/Test*/temp),)
-	build-tools/scripts/ln-to.sh -r . -o "$(_TEST_ERRORS_BASENAME)" bin/Test*/temp
+	build-tools/scripts/ln-to.sh -r . -o "$(_TEST_ERRORS_BASENAME)" bin/Test*/temp TestResult-*.xml bin/Test*/TestOutput-*.txt
 	zip -r "$(_TEST_ERRORS_BASENAME).zip" "$(_TEST_ERRORS_BASENAME)"
-endif # We have test error output
 
 _BUILD_STATUS_BUNDLE_INCLUDE = \
 	Configuration.OperatingSystem.props \

external/xamarin-android-tools

@@ -55,8 +55,12 @@ public class ResolveSdks : Task
 		[Output]
 		public string MonoAndroidBinPath { get; set; }
 
+		static  readonly    string  GetMacOSMicrosoftJdkPathsOverrideName   = $"GetMacOSMicrosoftJdkPaths jdks override! {typeof (Xamarin.Android.Tools.JdkInfo).AssemblyQualifiedName}";
+
 		public override bool Execute ()
 		{
+			Log.LogMessage (MessageImportance.High, "{0}", $"# jonp: ResolveSdks: JDKs overridden? {AppDomain.CurrentDomain.GetData (GetMacOSMicrosoftJdkPathsOverrideName)}");
+
 			// OS X:    $prefix/lib/xamarin.android/xbuild/Xamarin/Android
 			// Windows: %ProgramFiles(x86)%\MSBuild\Xamarin\Android
 			if (string.IsNullOrEmpty (MonoAndroidToolsPath)) {

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

@@ -208,9 +208,12 @@ public void ExplicitPackageNamingPolicy ()
 			}
 		}
 
+		static  readonly    string  GetMacOSMicrosoftJdkPathsOverrideName   = $"GetMacOSMicrosoftJdkPaths jdks override! Xamarin.Android.Tools.JdkInfo, Xamarin.Android.Tools.AndroidSdk, Version=1.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065";
+
 		[Test]
 		public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true, false)] bool perAbiApk)
 		{
+			Console.WriteLine ($"# jonp: CheckSignApk({useApkSigner}, {perAbiApk}): JDKs overridden? {AppDomain.CurrentDomain.GetData (GetMacOSMicrosoftJdkPathsOverrideName)}");
 			string ext = Environment.OSVersion.Platform != PlatformID.Unix ? ".bat" : "";
 			var foundApkSigner = Directory.EnumerateDirectories (Path.Combine (AndroidSdkPath, "build-tools")).Any (dir => Directory.EnumerateFiles (dir, "apksigner"+ ext).Any ());
 			if (useApkSigner && !foundApkSigner) {
@@ -229,10 +232,10 @@ public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true,
 			using (var b = CreateApkBuilder (Path.Combine ("temp", TestContext.CurrentContext.Test.Name))) {
 				b.Verbosity = Microsoft.Build.Framework.LoggerVerbosity.Diagnostic;
 				Assert.IsTrue (b.Build (proj), "build failed");
-				Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"));
+				Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), "First build should not contain warnings!");
 				proj.AndroidResources.First ().Timestamp = null;
 				Assert.IsTrue (b.Build (proj), "Second build failed");
-				Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"));
+				Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), "Second build should not contain warnings!");
 			}
 		}