CI fixes

Author: rib

.github/workflows/ci.yml

@@ -15,7 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         rust_version: [stable]
-        cargo_ndk_args: [-t arm64-v8a -t armeabi-v7a -t x86_64 -t x86 -o app/src/main/jniLibs/]
+        cargo_ndk_args:
+          [
+            -t arm64-v8a -t armeabi-v7a -t x86_64 -t x86 -o app/src/main/jniLibs/,
+          ]
     steps:
       - uses: actions/checkout@v3
 
@@ -37,8 +40,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: "temurin"
+          java-version: "17"
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
@@ -93,7 +96,7 @@ jobs:
       - name: Build agdk-cpal
         working-directory: agdk-cpal
         run: >
-          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} -P 26 build &&
           ./gradlew build &&
           find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
 
@@ -147,7 +150,6 @@ jobs:
       #    ./gradlew build &&
       #    find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
 
-
   format:
     runs-on: ubuntu-latest
     steps:

na-mainloop/src/lib.rs

@@ -1,9 +1,8 @@
 use std::sync::OnceLock;
 
 use android_activity::{
-    AndroidApp, InputStatus, MainEvent, OnCreateState, PollEvent,
     input::{InputEvent, KeyAction, KeyEvent, KeyMapChar, MotionAction},
-    ndk, ndk_sys,
+    ndk, ndk_sys, AndroidApp, InputStatus, MainEvent, OnCreateState, PollEvent,
 };
 use jni::{
     objects::{JObject, JString},