From fba20e193930fed6001035e5aa3880a577963d35 Mon Sep 17 00:00:00 2001
From: Dylan Perks <11160611+Perksey@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:52:15 -0500
Subject: [PATCH 1/4] Fix parameter being misused

---
 .github/workflows/sdl2.yml | 2 +-
 build/nuke/Native/Core.cs  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sdl2.yml b/.github/workflows/sdl2.yml
index ecbf7a3d26..ee915c3c05 100644
--- a/.github/workflows/sdl2.yml
+++ b/.github/workflows/sdl2.yml
@@ -148,7 +148,7 @@ jobs:
 
       - name: Build SDL2
         if: runner.os != 'Linux'
-        run: ${{ matrix.env.nuke_invoke }} SDL2 ${{ runner.os == 'Windows' && format('{0} {1}', '--native true --android-sdk-override', env.ANDROID_HOME) || '' }} 
+        run: ${{ matrix.env.nuke_invoke }} SDL2 ${{ runner.os == 'Windows' && format('{0} {1}', '--native true --android-home-value', env.ANDROID_HOME) || '' }} 
         env:
           PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
 
diff --git a/build/nuke/Native/Core.cs b/build/nuke/Native/Core.cs
index 5286495702..6a94bccf8a 100644
--- a/build/nuke/Native/Core.cs
+++ b/build/nuke/Native/Core.cs
@@ -29,9 +29,7 @@
 partial class Build {
     [Nuke.Common.Parameter("Build native code")] readonly bool Native;
 
-    [CanBeNull] string AndroidHomeValue;
-
-    [Nuke.Common.Parameter("Android home. Will be determined from dotnet if not provided.")] readonly string AndroidHomeOverride;
+    [Nuke.Common.Parameter("Android home. Will be determined from dotnet if not provided.")] [CanBeNull] string AndroidHomeValue;
 
     static string JobsArg => string.IsNullOrWhiteSpace(GitHubActions.Instance?.Job)
         ? $" -j{Jobs}"

From bf206b6e2b6c1cb5b70d73c9f5b80903aaee3246 Mon Sep 17 00:00:00 2001
From: Dylan Perks <11160611+Perksey@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:58:50 -0500
Subject: [PATCH 2/4] Fix a silly mistake

---
 build/nuke/Native/SilkDroid.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build/nuke/Native/SilkDroid.cs b/build/nuke/Native/SilkDroid.cs
index 7975ad52dd..e3f670e0a9 100644
--- a/build/nuke/Native/SilkDroid.cs
+++ b/build/nuke/Native/SilkDroid.cs
@@ -36,12 +36,6 @@ string AndroidHome
                 return AndroidHomeValue;
             }
 
-            if (AndroidHomeOverride is not null)
-            {
-                AndroidHomeValue = AndroidHomeOverride;
-                return AndroidHomeValue;
-            }
-
             if ((Environment.GetEnvironmentVariable("ANDROID_HOME") ?? Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT")) is {} sdk)
             {
                 AndroidHomeOverride = sdk;

From e8b1d7ea8111937ac2bca1e6adcc2bd1843667f8 Mon Sep 17 00:00:00 2001
From: Dylan Perks <11160611+Perksey@users.noreply.github.com>
Date: Thu, 6 Jun 2024 16:04:53 -0500
Subject: [PATCH 3/4] Fix a silly mistake 2

---
 build/nuke/Native/SilkDroid.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/nuke/Native/SilkDroid.cs b/build/nuke/Native/SilkDroid.cs
index e3f670e0a9..238f810af3 100644
--- a/build/nuke/Native/SilkDroid.cs
+++ b/build/nuke/Native/SilkDroid.cs
@@ -38,7 +38,7 @@ string AndroidHome
 
             if ((Environment.GetEnvironmentVariable("ANDROID_HOME") ?? Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT")) is {} sdk)
             {
-                AndroidHomeOverride = sdk;
+                AndroidHomeValue = sdk;
                 return sdk;
             }
 

From b8c0276368031e56f828754903a90fa3a274ac4c Mon Sep 17 00:00:00 2001
From: "The Silk.NET Automaton" <9011267+dotnet-bot@users.noreply.github.com>
Date: Thu, 6 Jun 2024 21:19:45 +0000
Subject: [PATCH 4/4] New binaries for SDL2 on Linux 6.5.0-1021-azure
 #22~22.04.1-Ubuntu SMP Tue Apr 30 16:08:18 UTC 2024

---
 .nuke/build.schema.json      | 4 ++++
 .nuke/temp/build-attempt.log | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 .nuke/temp/build-attempt.log

diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
index 09c66fc913..fd82952294 100644
--- a/.nuke/build.schema.json
+++ b/.nuke/build.schema.json
@@ -30,6 +30,10 @@
           "type": "boolean",
           "description": "If specified, ignores any generated solution present and builds the entire project"
         },
+        "AndroidHomeValue": {
+          "type": "string",
+          "description": "Android home. Will be determined from dotnet if not provided"
+        },
         "Configuration": {
           "type": "string",
           "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)"
diff --git a/.nuke/temp/build-attempt.log b/.nuke/temp/build-attempt.log
new file mode 100644
index 0000000000..1fae566483
--- /dev/null
+++ b/.nuke/temp/build-attempt.log
@@ -0,0 +1,2 @@
+67ebe2bcf0672c5ed5b64b7cf995a2fd
+Prerequisites