test android

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

Author: sagudev

.github/workflows/main.yml

@@ -12,66 +12,35 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  Build:
+  android-test:
     name: ${{ format('{0} {1}', matrix.platform.target, matrix.features)}}
-    runs-on: ${{ matrix.platform.os }}
+    runs-on: ubuntu-24.04
     env:
       RUST_BACKTRACE: 1
     strategy:
       fail-fast: false
       matrix:
         platform:
-          #- { target: aarch64-apple-darwin, os: macos-14, test: true }
-          #- { target: x86_64-apple-darwin, os: macos-13, test: true }
-          #- { target: x86_64-unknown-linux-gnu, os: ubuntu-24.04, test: true }
-          #- { target: x86_64-pc-windows-msvc, os: windows-latest, test: true }
-          #- { target: i686-pc-windows-msvc, os: windows-latest, test: false }
-          #- { target: aarch64-pc-windows-msvc, os: windows-latest, test: false }
-          #- {
-          #    target: aarch64-unknown-linux-ohos,
-          #    os: ubuntu-24.04,
-          #    test: false,
-          #  }
-          - { target: arm-linux-androideabi, os: ubuntu-24.04, test: true }
-          - { target: aarch64-linux-android, os: ubuntu-24.04, test: true }
-          - { target: armv7-linux-androideabi, os: ubuntu-24.04, test: true }
-          - { target: x86_64-linux-android, os: ubuntu-24.04, test: true }
+          - { target: aarch64-linux-android, arch: arm64-v8a }
+          - { target: x86_64-linux-android, arch: x86_64 }
         features:
           [
             "",
             "chains sm-raw-window-handle-06",
             "chains sm-raw-window-handle-05",
           ]
-        #include:
-        #- features: "sm-x11 sm-wayland-default"
-        #  platform:
-        #    { target: x86_64-unknown-linux-gnu, os: ubuntu-24.04, test: true }
-        #- features: "chains sm-angle-builtin"
-        #  platform:
-        #    { target: x86_64-pc-windows-msvc, os: windows-latest, test: true }
-        #- features: "chains sm-no-wgl sm-angle-builtin"
-        #  platform:
-        #    { target: x86_64-pc-windows-msvc, os: windows-latest, test: true }
     steps:
       - uses: actions/checkout@v4
-      - name: Install dependencies (Linux)
-        if: startsWith(matrix.platform.os, 'ubuntu')
-        run: |
-          sudo apt update
-          sudo apt install gcc libxxf86vm-dev libosmesa6-dev libgles2-mesa-dev xvfb weston -y
       - name: Set up JDK 17
-        if: ${{ contains(matrix.platform.target, 'android') }}
         uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "temurin"
       - name: Setup Android SDK
-        if: ${{ contains(matrix.platform.target, 'android') }}
         uses: android-actions/setup-android@v3
         with:
           packages: "tools platform-tools platforms;android-33"
       - name: Install Android NDK
-        if: ${{ contains(matrix.platform.target, 'android') }}
         uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
@@ -81,26 +50,60 @@ jobs:
         uses: dtolnay/rust-toolchain@1.81.0
         with:
           targets: ${{ matrix.platform.target }}
-      - name: Build
-        run: |
-          cargo build --features "${{ matrix.features }}" --target ${{ matrix.platform.target }}
-      - name: Test
-        if: ${{ matrix.platform.test && startsWith(matrix.platform.os, 'ubuntu') && !contains(matrix.platform.target, 'android') }}
-        run: |
-          weston --no-config --socket=wl-test-env --backend=headless &
-          WAYLAND_DISPLAY=wl-test-env xvfb-run cargo test --features "${{ matrix.features }}" --target ${{ matrix.platform.target }}
-      - name: Test
-        if: ${{ matrix.platform.test && !startsWith(matrix.platform.os, 'ubuntu') && !contains(matrix.platform.target, 'android') }}
+
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-dinghy
+
+      - name: Enable KVM
         run: |
-          cargo test --features "${{ matrix.features }}" --target ${{ matrix.platform.target }}
-      - name: Test
-        if: ${{ matrix.platform.test && contains(matrix.platform.target, 'android') }}
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: AVD cache
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-30-${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{runner.arch}}
+
+      - name: Create directory for avd
+        # This shouldn't be necesary but this is a work around for
+        # https://github.com/ReactiveCircus/android-emulator-runner/issues/197
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        run: mkdir -p ~/.android/avd
+
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        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 }}
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Run tests in android emulator
+        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 }}
-        run: |
-          cargo install cargo-dinghy
-          cargo dinghy all-platforms
-          cargo dinghy test --features "${{ matrix.features }}" --target ${{ matrix.platform.target }}
+        with:
+          api-level: 30
+          ndk: ${{ steps.setup-ndk.outputs.ndk-full-version }}
+          arch: ${{ matrix.platform.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
+          script: |
+            cargo dinghy all-platforms
+            cargo dinghy all-devices
+            cargo dinghy -p auto-android-${{ matrix.platform.arch }}-api30 test --features "${{ matrix.features }}" -- --test-threads 1
   Format:
     name: Run `rustfmt`
     runs-on: ubuntu-24.04
@@ -111,7 +114,7 @@ jobs:
   build_result:
     name: Result
     runs-on: ubuntu-24.04
-    needs: ["Build", "Format"]
+    needs: ["android-test", "Format"]
     if: always()
     steps:
       - name: Mark the job as successful