Skip to content

Commit d69c219

Browse files
committed
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) Context: #2004 (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. We are [observing some unit test failures in this bump][0], which [appear to be machine-specific][1]. We still don't understand the cause of the unit test failures, so to assist in the eventual tracking of this issue there is some additional, conditional, debug spew. [0]: #2004 (comment) [1]: #2004 (comment)
1 parent 69d78d0 commit d69c219

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

external/xamarin-android-tools

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,15 @@ public class ResolveSdks : Task
5555
[Output]
5656
public string MonoAndroidBinPath { get; set; }
5757

58+
static readonly string GetMacOSMicrosoftJdkPathsOverrideName = $"GetMacOSMicrosoftJdkPaths jdks override! {typeof (Xamarin.Android.Tools.JdkInfo).AssemblyQualifiedName}";
59+
5860
public override bool Execute ()
5961
{
62+
object shouldNotBeSet = AppDomain.CurrentDomain.GetData (GetMacOSMicrosoftJdkPathsOverrideName);
63+
if (shouldNotBeSet != null) {
64+
Log.LogMessage (MessageImportance.High, "{0}", $"AndroidSdkInfo unit test AppDomain key is set: {shouldNotBeSet}");
65+
}
66+
6067
// OS X: $prefix/lib/xamarin.android/xbuild/Xamarin/Android
6168
// Windows: %ProgramFiles(x86)%\MSBuild\Xamarin\Android
6269
if (string.IsNullOrEmpty (MonoAndroidToolsPath)) {

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,12 @@ public void ExplicitPackageNamingPolicy ()
208208
}
209209
}
210210

211+
static readonly string GetMacOSMicrosoftJdkPathsOverrideName = "GetMacOSMicrosoftJdkPaths jdks override! Xamarin.Android.Tools.JdkInfo, Xamarin.Android.Tools.AndroidSdk, Version=1.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065";
212+
211213
[Test]
212214
public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true, false)] bool perAbiApk)
213215
{
216+
Console.WriteLine ($"# jonp: CheckSignApk({useApkSigner}, {perAbiApk}): JDKs overridden? {AppDomain.CurrentDomain.GetData (GetMacOSMicrosoftJdkPathsOverrideName)}");
214217
string ext = Environment.OSVersion.Platform != PlatformID.Unix ? ".bat" : "";
215218
var foundApkSigner = Directory.EnumerateDirectories (Path.Combine (AndroidSdkPath, "build-tools")).Any (dir => Directory.EnumerateFiles (dir, "apksigner"+ ext).Any ());
216219
if (useApkSigner && !foundApkSigner) {
@@ -229,10 +232,15 @@ public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true,
229232
using (var b = CreateApkBuilder (Path.Combine ("temp", TestContext.CurrentContext.Test.Name))) {
230233
b.Verbosity = Microsoft.Build.Framework.LoggerVerbosity.Diagnostic;
231234
Assert.IsTrue (b.Build (proj), "build failed");
232-
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"));
235+
if (!StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)")) {
236+
Console.WriteLine ($"-- BEGIN CheckSignApk({useApkSigner}, {perAbiApk}) output--");
237+
Console.WriteLine (b.LastBuildOutput);
238+
Console.WriteLine ($"-- END CheckSignApk({useApkSigner}, {perAbiApk}) output--");
239+
}
240+
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), "First build should not contain warnings!");
233241
proj.AndroidResources.First ().Timestamp = null;
234242
Assert.IsTrue (b.Build (proj), "Second build failed");
235-
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"));
243+
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), "Second build should not contain warnings!");
236244
}
237245
}
238246

0 commit comments

Comments
 (0)