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

…r-in-ci/sdl2_bins
dotnet · Jun 6, 2024 · 00488c8 · 00488c8
2 parents cf809f9 + b8c0276
commit 00488c8
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 12 deletions.
diff --git 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/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -30,7 +30,7 @@
  "type": "boolean",
  "description": "If specified, ignores any generated solution present and builds the entire project"
  },
- "AndroidHomeOverride": {
+ "AndroidHomeValue": {
  "type": "string",
  "description": "Android home. Will be determined from dotnet if not provided"
  },

diff --git 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}"

diff --git a/build/nuke/Native/SilkDroid.cs b/build/nuke/Native/SilkDroid.cs
@@ -36,15 +36,9 @@ 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;
+ AndroidHomeValue = sdk;
  return sdk;
  }
 

diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/ios/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/ios/native/libSDL2.a
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/iossimulator/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/iossimulator/native/libSDL2.a
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/tvos/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/tvos/native/libSDL2.a
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/tvossimulator/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/tvossimulator/native/libSDL2.a