CI test for 16kb and non-16kb page alignment

Author: Haz3-jolt

.github/workflows/tests_emulator.yml

@@ -24,15 +24,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Refactor to make these dynamic with a low/high bracket only on schedule, not push
-        # For now this is the latest supported API. Previously API 29 was fastest.
-        # #13695: This was reverted to API 30, 31 was unstable. This should be fixed
-        api-level: [30]
-        arch: [x86_64]
-        target: [google_apis]
-        first-boot-delay: [600]
-        # This is useful for benchmarking, do 0, 1, 2, etc (up to 256 max job-per-matrix limit) for averages
-        iteration: [0]
+        # Control which API level + target combinations run
+        include:
+          - api-level: 30
+            arch: x86_64
+            target: google_apis
+            first-boot-delay: 600
+            iteration: 0
+          - api-level: 35
+            arch: x86_64
+            target: google_apis
+            first-boot-delay: 600
+            iteration: 0
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: insightsengineering/disk-space-reclaimer@v1
@@ -158,6 +161,54 @@ jobs:
             sleep 5
             ./gradlew uninstallAll jacocoAndroidTestReport --daemon
 
+      - name: Configure NDK tools PATH for alignment checking
+        run: |
+          echo "Using pre-installed NDK tools for alignment checking"
+          if [ ! -d "$ANDROID_NDK_LATEST_HOME" ]; then
+            echo "Error: NDK tools not found at $ANDROID_NDK_LATEST_HOME"
+            echo "The NDK should be pre-installed in the runner image. Failing fast."
+            exit 1
+          fi
+          
+          NDK_VERSION=$(basename $ANDROID_NDK_LATEST_HOME)
+          echo "Using NDK version: $NDK_VERSION"
+          echo "export PATH=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH" >> $GITHUB_ENV
+
+      - name: Check APK ELF Alignment
+        run: |
+          chmod +x .github/check_elf_alignment.sh
+          APK_PATH="AnkiDroid/build/outputs/apk/play/release/AnkiDroid-play-arm64-v8a-release.apk"
+          
+          if [ ! -f "$APK_PATH" ]; then
+            echo "Error: APK file not found at $APK_PATH"
+            echo "The APK should have been built in previous steps. Failing fast."
+            exit 1
+          fi
+          
+          echo "Using APK: $APK_PATH"
+          .github/check_elf_alignment.sh $APK_PATH
+
+      - name: Verify zipalign
+        run: |
+          APK_PATH="AnkiDroid/build/outputs/apk/play/release/AnkiDroid-play-arm64-v8a-release.apk"
+          echo "Verifying zipalign with 16KB alignment for $APK_PATH"
+          
+          # Find the latest build-tools version dynamically
+          LATEST_BUILD_TOOLS=$(ls -d $ANDROID_HOME/build-tools/* | sort -V | tail -n 1)
+          ZIPALIGN_PATH="$LATEST_BUILD_TOOLS/zipalign"
+          echo "Using zipalign at: $ZIPALIGN_PATH"
+          
+          # Verify zipalign exists
+          if [ ! -f "$ZIPALIGN_PATH" ]; then
+            echo "Error: zipalign not found at $ZIPALIGN_PATH"
+            echo "Available build-tools versions:"
+            ls -la $ANDROID_HOME/build-tools/
+            exit 1
+          fi
+          
+          # Use the zipalign tool
+          $ZIPALIGN_PATH -c -P 16 -v 4 $APK_PATH
+
       - name: Upload Test Report
         uses: actions/upload-artifact@v4
         if: always()