f

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

Author: sagudev

.github/workflows/main.yml

@@ -21,8 +21,12 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - { target: aarch64-linux-android, arch: arm64-v8a }
-          - { target: x86_64-linux-android, arch: x86_64 }
+          - {
+              target: aarch64-linux-android,
+              avd_arch: arm64-v8a,
+              arch: aarch64,
+            }
+          - { target: x86_64-linux-android, avd_arch: x86_64, arch: x86_64 }
         features:
           [
             "",
@@ -31,20 +35,6 @@ jobs:
           ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: "17"
-          distribution: "temurin"
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-        with:
-          packages: "tools platform-tools platforms;android-33"
-      - name: Install Android NDK
-        uses: nttld/setup-ndk@v1
-        id: setup-ndk
-        with:
-          ndk-version: r26c
       - name: Install rust
         id: toolchain
         uses: dtolnay/rust-toolchain@1.81.0
@@ -81,9 +71,8 @@ jobs:
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: 30
-          ndk: ${{ steps.setup-ndk.outputs.ndk-full-version }}
           force-avd-creation: false
-          arch: ${{ matrix.platform.arch }}
+          arch: ${{ matrix.platform.avd_arch }}
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
           script: echo "Generated AVD snapshot for caching."
@@ -92,11 +81,9 @@ jobs:
         uses: reactivecircus/android-emulator-runner@v2
         env:
           RANLIB: "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         with:
           api-level: 30
-          ndk: ${{ steps.setup-ndk.outputs.ndk-full-version }}
-          arch: ${{ matrix.platform.arch }}
+          arch: ${{ matrix.platform.avd_arch }}
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true

Cargo.toml

@@ -39,15 +39,19 @@ libc = "0.2"
 log = "0.4"
 glow = "0.16"
 osmesa-sys = { version = "0.1", optional = true }
-rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = ["std"], optional = true }
-rwh_06 = { package = "raw-window-handle", version = "0.6.2", features = ["std"], optional = true }
+rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [
+    "std",
+], optional = true }
+rwh_06 = { package = "raw-window-handle", version = "0.6.2", features = [
+    "std",
+], optional = true }
 
 [dev-dependencies]
 clap = "2"
 gl = "0.14"
 png = "0.17"
 rand = "0.8"
-winit = "0.29"
+winit = { version = "0.29.10", features = ["android-native-activity"] }
 serial_test = "3.1.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]