Merge branch 'hotfix/build-sdl-aar-in-ci' into ci/hotfix/build-sdl-aa…

…r-in-ci/wgpu_bins
dotnet · Jun 6, 2024 · 6ec0e2c · 6ec0e2c
2 parents 50d9f59 + 35c7ee5
commit 6ec0e2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.nuke/temp/build-attempt.log b/.nuke/temp/build-attempt.log
@@ -1,2 +1,2 @@
-20461fe6483b7f25ad31939f51c82588
+1de80427feb0a364f4ee2706ac1a0a3a
 Prerequisites
diff --git a/build/nuke/Native/SilkDroid.cs b/build/nuke/Native/SilkDroid.cs
@@ -42,6 +42,12 @@ string AndroidHome
                 return AndroidHomeValue;
             }
 
+            if ((Environment.GetEnvironmentVariable("ANDROID_HOME") ?? Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT")) is {} sdk)
+            {
+                AndroidHomeOverride = sdk;
+                return sdk;
+            }
+
             var utils = RootDirectory / "build" / "utilities";
             DotNet($"build \"{utils / "android_probe.proj"}\" /t:GetAndroidJar");
             AndroidHomeValue = (AbsolutePath) File.ReadAllText(utils / "android.jar.gen.txt") / ".." / ".." / "..";
@@ -86,6 +92,7 @@ string AndroidHome
 
                     var envVars = CreateEnvVarDictionary();
                     envVars["ANDROID_HOME"] = AndroidHome;
+                    envVars["ANDROID_SDK_ROOT"] = AndroidHome;
 
                     foreach (var ndk in Directory.GetDirectories((AbsolutePath) AndroidHome / "ndk")
                                  .OrderByDescending(x => Version.Parse(Path.GetFileName(x))))