From 609c8c10eebfaa31b86d2a62ab01bc4566ac0047 Mon Sep 17 00:00:00 2001 From: Dylan Perks <11160611+Perksey@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:11:20 -0500 Subject: [PATCH] Override ANDROID_HOME? idk --- .github/workflows/sdl2.yml | 5 ++--- build/nuke/Native/Core.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sdl2.yml b/.github/workflows/sdl2.yml index 7e0788e84f..03f6e1b5ed 100644 --- a/.github/workflows/sdl2.yml +++ b/.github/workflows/sdl2.yml @@ -141,8 +141,7 @@ jobs: - name: Build SDL2 if: runner.os != 'Linux' - run: ${{ matrix.env.nuke_invoke }} SDL2 ${{ runner.os == 'Windows' && '--native' || '' }} + run: ${{ matrix.env.nuke_invoke }} SDL2 ${{ runner.os == 'Windows' && '--native --android-home-value ${{ env.ANDROID_HOME }}' || '' }} env: PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }} - ANDROID_HOME: ${{ env.ANDROID_HOME }} - ANDROID_SDK_ROOT: ${{ env.ANDROID_SDK_ROOT }} + diff --git a/build/nuke/Native/Core.cs b/build/nuke/Native/Core.cs index 4f412f553f..f3af7e8590 100644 --- a/build/nuke/Native/Core.cs +++ b/build/nuke/Native/Core.cs @@ -29,7 +29,7 @@ partial class Build { [Nuke.Common.Parameter("Build native code")] readonly bool Native; - [CanBeNull] string AndroidHomeValue; + [Parameter("Android home. Will be determined from dotnet if not provided.")] [CanBeNull] string AndroidHomeValue; static string JobsArg => string.IsNullOrWhiteSpace(GitHubActions.Instance?.Job) ? $" -j{Jobs}"