Update sysroot variables

Author: BeanCheeseBurrito

.github/workflows/ci.yml

@@ -49,32 +49,29 @@ jobs:
         with:
           dotnet-version: 8.0.x
 
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
       - name: Set Version Suffix
         shell: bash
         run: |
           if [ '${{ github.event.inputs.use-auto-generated-version }}' != 'false' ]; then
             echo "BuildVersionSuffix=build.$(git rev-list --count HEAD)" >> $GITHUB_ENV
           fi
 
-      - name: Setup IOS SDK
+      - name: Set IOS SDK Variables
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
-          echo "IOS_SDK=$(xcrun --sdk iphoneos --show-sdk-path)" >> $GITHUB_ENV
-          echo "IOS_SIMULATOR_SDK=$(xcrun --sdk iphonesimulator --show-sdk-path)" >> $GITHUB_ENV
-
-      - name: Setup Android NDK
-        if: matrix.os == 'macos-latest'
-        uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r25c
-          link-to-sdk: true
+          echo "IOS_SDK_SYSROOT=$(xcrun --sdk iphoneos --show-sdk-path)" >> $GITHUB_ENV
+          echo "IOS_SIMULATOR_SDK_SYSROOT=$(xcrun --sdk iphonesimulator --show-sdk-path)" >> $GITHUB_ENV
 
-      - name: Set Android NDK variables
+      - name: Set Android NDK Variables
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
-          echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> $GITHUB_ENV
+          echo "ANDROID_NDK=$(find "$ANDROID_SDK_ROOT/ndk/" -mindepth 1 -maxdepth 1 -type d | sort | head -n 1)" >> $GITHUB_ENV
+          echo "ANDROID_NDK_SYSROOT=$ANDROID_NDK/toolchains/llvm/prebuilt/darwin-x86_64/sysroot" >> $GITHUB_ENV
 
       - name: Restore Dependencies
         shell: bash

Box2D.NET.Native/Box2D.NET.Native.csproj

@@ -51,7 +51,7 @@
     <Import Project="$(NuGetPackageRoot)/microsoft.net.runtime.emscripten.3.1.56.cache.$(HostRuntime)/9.0.5/Sdk/Sdk.props"/>
 
     <PropertyGroup>
-        <EMSCRIPTEN_CACHE Condition="$(EMSCRIPTEN_CACHE) == ''" >$(WasmCachePath)</EMSCRIPTEN_CACHE>
+        <EMSCRIPTEN_CACHE_SYSROOT Condition="$(EMSCRIPTEN_CACHE_SYSROOT) == ''" >$(WasmCachePath)sysroot</EMSCRIPTEN_CACHE_SYSROOT>
     </PropertyGroup>
 
     <!-- Determine mapping between dotnet RID and zig targets -->
@@ -109,37 +109,37 @@
         <When Condition="$(RuntimeIdentifier) == 'iossimulator-x64'">
             <PropertyGroup>
                 <ZigIdentifier>x86_64-ios-simulator</ZigIdentifier>
-                <ZigArgs>--sysroot "$(IOS_SIMULATOR_SDK)"</ZigArgs>
+                <ZigArgs>--sysroot "$(IOS_SIMULATOR_SDK_SYSROOT)"</ZigArgs>
             </PropertyGroup>
         </When>
         <When Condition="$(RuntimeIdentifier) == 'iossimulator-arm64'">
             <PropertyGroup>
                 <ZigIdentifier>aarch64-ios-simulator</ZigIdentifier>
-                <ZigArgs>--sysroot "$(IOS_SIMULATOR_SDK)"</ZigArgs>
+                <ZigArgs>--sysroot "$(IOS_SIMULATOR_SDK_SYSROOT)"</ZigArgs>
             </PropertyGroup>
         </When>
         <When Condition="$(RuntimeIdentifier) == 'ios-arm64'">
             <PropertyGroup>
                 <ZigIdentifier>aarch64-ios</ZigIdentifier>
-                <ZigArgs>--sysroot "$(IOS_SDK)"</ZigArgs>
+                <ZigArgs>--sysroot "$(IOS_SDK_SYSROOT)"</ZigArgs>
             </PropertyGroup>
         </When>
         <When Condition="$(RuntimeIdentifier) == 'browser-wasm'">
             <PropertyGroup>
                 <ZigIdentifier>wasm32-emscripten</ZigIdentifier>
-                <ZigArgs>--sysroot "$(EMSCRIPTEN_CACHE)"</ZigArgs>
+                <ZigArgs>--sysroot "$(EMSCRIPTEN_CACHE_SYSROOT)"</ZigArgs>
             </PropertyGroup>
         </When>
         <When Condition="$(RuntimeIdentifier) == 'android-arm64'">
             <PropertyGroup>
                 <ZigIdentifier>aarch64-linux-android</ZigIdentifier>
-                <ZigArgs>--sysroot "$(ANDROID_NDK_HOME)"</ZigArgs>
+                <ZigArgs>--sysroot "$(ANDROID_NDK_SYSROOT)"</ZigArgs>
             </PropertyGroup>
         </When>
         <When Condition="$(RuntimeIdentifier) == 'android-x64'">
             <PropertyGroup>
                 <ZigIdentifier>x86_64-linux-android</ZigIdentifier>
-                <ZigArgs>--sysroot "$(ANDROID_NDK_HOME)"</ZigArgs>
+                <ZigArgs>--sysroot "$(ANDROID_NDK_SYSROOT)"</ZigArgs>
             </PropertyGroup>
         </When>
         <Otherwise>

Box2D.NET.Native/build.zig

@@ -96,24 +96,17 @@ pub fn compile(b: *Build, options: BuildOptions) !void {
                     @panic("A --sysroot path to an Android NDK needs to be provided when compiling for Android.");
                 }
 
-                const host_tuple = switch (builtin.target.os.tag) {
-                    .linux => "linux-x86_64",
-                    .windows => "windows-x86_64",
-                    .macos => "darwin-x86_64",
-                    else => @panic("unsupported host OS"),
-                };
-
                 const triple = switch (options.target.result.cpu.arch) {
                     .aarch64 => "aarch64-linux-android",
                     .x86_64 => "x86_64-linux-android",
                     else => @panic("Unsupported Android architecture"),
                 };
+
                 const android_api_level: []const u8 = "21";
 
-                const android_sysroot = b.pathJoin(&.{ b.sysroot.?, "/toolchains/llvm/prebuilt/", host_tuple, "/sysroot" });
-                const android_lib_path = b.pathJoin(&.{ "/usr/lib/", triple, android_api_level });
-                const android_include_path = b.pathJoin(&.{ android_sysroot, "/usr/include" });
-                const android_system_include_path = b.pathJoin(&.{ android_sysroot, "/usr/include/", triple });
+                const android_lib_path = b.pathJoin(&.{ b.sysroot.?, "/usr/lib/", triple, android_api_level });
+                const android_include_path = b.pathJoin(&.{ b.sysroot.?, "/usr/include" });
+                const android_system_include_path = b.pathJoin(&.{ b.sysroot.?, "/usr/include/", triple });
 
                 lib.addLibraryPath(.{ .cwd_relative = android_lib_path });