Add Custom OpenCV and ONNX Runtime Builds and OCR performance optimization

.github/actions/setup-custom-maven/action.yml

@@ -0,0 +1,13 @@
+name: Setup Custom Maven Repo
+description: Downloads custom-built onnxruntime/opencv maven artifacts from custom-lib-builds releases into maven-local/
+
+runs:
+  using: composite
+  steps:
+    # Cache may not applicable for onnxruntime, as it may change its opset while
+    # not changing its version.
+    # Since GitHub Actions should have quite fast Internet access to its own
+    # release service, we don't set up caches here.
+    - name: Download and extract custom maven repo
+      run: bash .github/scripts/setup-custom-maven.sh
+      shell: bash

.github/actions/setup-ocr-model/action.yml

@@ -9,7 +9,7 @@ runs:
       uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
       with:
         path: app/src/main/assets/ocr
-        key: ocr-models_crnn-1.0.2
+        key: ocr-models_crnn-1.0.3
 
     - name: Ensure CRNN OCR model asset folder exists
       if: steps.cache-ocr.outputs.cache-hit != 'true'

.github/scripts/setup-custom-maven.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# setup-custom-maven.sh
+#
+# Downloads the custom-built onnxruntime/opencv maven artifacts from the
+# custom-lib-builds stable release tags and extracts them into maven-local/.
+# maven-local/ uses the same GAVs as the official artifacts, so Gradle
+# resolves the custom builds first (settings.gradle.kts local repo block).
+#
+# Hard-fail: a download error aborts the build. Falling back to the official
+# artifacts would ship an APK that differs from what was verified locally.
+set -euo pipefail
+
+# .github/scripts/ -> repo root
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+MAVEN_LOCAL="${MAVEN_LOCAL:-$ROOT/maven-local}"
+
+# Stable tags, overwritten on publish (URL stays the same, content changes).
+# No actions/cache: a version-based cache key would serve stale artifacts
+# after a republish. GitHub Actions has fast access to its own releases,
+# so we just re-download (~125MB) on every run.
+ORT_TAG="${ORT_TAG:-onnxruntime-1.26.0}"
+OPENCV_TAG="${OPENCV_TAG:-opencv-5.0.0}"
+BASE_URL="https://github.com/ArcaeaOffline/custom-lib-builds/releases/download"
+
+mkdir -p "$MAVEN_LOCAL"
+
+download_and_extract() { # $1=tag, $2=local zip path
+    curl -fL -o "$2" "$BASE_URL/$1/maven_repo.zip"
+    unzip -q -o "$2" -d "$MAVEN_LOCAL"
+    rm -f "$2"
+}
+
+download_and_extract "$ORT_TAG" /tmp/ort-maven.zip
+download_and_extract "$OPENCV_TAG" /tmp/opencv-maven.zip
+
+# The two zips have com/ and org/ roots; they merge into maven-local/
+# without conflicts. Verify the expected AARs actually landed.
+test -f "$MAVEN_LOCAL/com/microsoft/onnxruntime/onnxruntime-android/1.26.0/onnxruntime-android-1.26.0.aar"
+test -f "$MAVEN_LOCAL/org/opencv/opencv/5.0.0/opencv-5.0.0.aar"

.github/scripts/verify-apk-signing.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# verify-apk-signing.sh
+#
+# Verifies signatures of all unstableRelease APKs.
+# Hard-fail: unsigned or invalidly signed APKs must abort the build.
+set -euo pipefail
+
+# Use the newest build-tools for this run
+BUILD_TOOLS_VERSION="$(find "$ANDROID_HOME/build-tools" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort -V | tail -n 1)"
+PATH="$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION:$PATH"
+
+APK_DIR="${APK_DIR:-app/build/outputs/apk/unstable/release}"
+
+for apk in \
+    "$APK_DIR/app-unstable-arm64-v8a-release.apk" \
+    "$APK_DIR/app-unstable-armeabi-v7a-release.apk" \
+    "$APK_DIR/app-unstable-x86_64-release.apk" \
+    "$APK_DIR/app-unstable-x86-release.apk" \
+    "$APK_DIR/app-unstable-universal-release.apk"; do
+    apksigner verify --verbose --min-sdk-version 24 "$apk"
+done

.github/scripts/verify-custom-libs.sh

@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+# Verifies the built APKs use the custom-built onnxruntime/opencv
+# from maven-local/ instead of silently falling back to the
+# official artifacts.
+#
+# Size is the primary signal: the custom .so files are ~50% the size
+# of the official ones, far outside the +/-10% tolerance.
+# sha256 hashes are reported for reference only: release build may
+# strip on the .so files, so hashes legitimately differ there.
+#
+# Soft-fail: mismatches are reported as warnings in the job summary,
+# but don't terminate the build.
+set -euo pipefail
+
+# .github/scripts/ -> repo root
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+MAVEN_LOCAL="${MAVEN_LOCAL:-$ROOT/maven-local}"
+APK_DIR="${APK_DIR:-$ROOT/app/build/outputs/apk/unstable/release}"
+
+# <so name>|<AAR path relative to maven-local>
+# Keep in sync with .github/actions/setup-custom-maven/action.yml
+LIBS=(
+    "libonnxruntime.so|com/microsoft/onnxruntime/onnxruntime-android/1.26.0/onnxruntime-android-1.26.0.aar"
+    "libopencv_java5.so|org/opencv/opencv/5.0.0/opencv-5.0.0.aar"
+)
+# universal APK is the union of these four, so no special checks for it
+ABIS=(arm64-v8a armeabi-v7a x86 x86_64)
+
+# sha256 of a file inside a zip; empty output if the entry is missing
+# $1=zip file, $2=path inside zip
+file_in_zip_sha256() {
+    if ! unzip -l "$1" "$2" >/dev/null 2>&1; then
+        return 1
+    fi
+    unzip -p "$1" "$2" | sha256sum | cut -d' ' -f1
+}
+
+# size of a file inside a zip; empty output if the entry is missing
+# $1=zip file, $2=path inside zip
+file_in_zip_size() {
+    if ! unzip -l "$1" "$2" >/dev/null 2>&1; then
+        return 1
+    fi
+    unzip -p "$1" "$2" | wc -c
+}
+
+warnings=()
+
+{
+    if [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
+        echo "## Custom build verification"
+        echo ""
+    fi
+    for entry in "${LIBS[@]}"; do
+        so="${entry%%|*}"
+        aar="$MAVEN_LOCAL/${entry#*|}"
+        echo "### $so"
+        echo ""
+        echo "| ABI | Size (maven-local, B) | Size (APK, B) | sha256 (maven-local) | sha256 (APK) | Result |"
+        echo "| --- | --- | --- | --- | --- | --- |"
+        for abi in "${ABIS[@]}"; do
+            apk="$APK_DIR/app-unstable-$abi-release.apk"
+            if [ ! -f "$apk" ]; then
+                warnings+=("missing APK: $apk")
+                echo "| $abi | - | - | - | - | APK missing |"
+                continue
+            fi
+            custom="$(file_in_zip_sha256 "$aar" "jni/$abi/$so" || true)"
+            packed="$(file_in_zip_sha256 "$apk" "lib/$abi/$so" || true)"
+            custom_size="$(file_in_zip_size "$aar" "jni/$abi/$so" || true)"
+            packed_size="$(file_in_zip_size "$apk" "lib/$abi/$so" || true)"
+
+            result="OK"
+            if [ -z "$custom" ] || [ -z "$custom_size" ]; then
+                warnings+=("$abi/$so: custom .so not found in $aar")
+                result="NOT FOUND"
+            elif [ -z "$packed" ] || [ -z "$packed_size" ]; then
+                warnings+=("$abi/$so: .so not found in APK")
+                result="NOT FOUND"
+            elif [ "$packed_size" -lt $((custom_size * 90 / 100)) ] || \
+                 [ "$packed_size" -gt $((custom_size * 110 / 100)) ]; then
+                warnings+=("$abi/$so: size ${packed_size}B, expected ~${custom_size}B")
+                result="SIZE MISMATCH"
+            fi
+            echo "| $abi | ${custom_size:--} | ${packed_size:--} | ${custom:0:12}.. | ${packed:0:12}.. | $result |"
+        done
+        echo ""
+    done
+} >>"${GITHUB_STEP_SUMMARY:-/dev/null}"
+
+if [ "${#warnings[@]}" -gt 0 ]; then
+    for w in "${warnings[@]}"; do
+        echo "::warning::$w"
+    done
+    # Non-zero exit marks the step yellow; the workflow step uses
+    # continue-on-error so this never blocks artifact upload/release.
+    exit 1
+fi
+exit 0

.github/workflows/build_unstable.yml

@@ -26,6 +26,9 @@ jobs:
       - name: Setup Toolchain
         uses: ./.github/actions/setup-toolchain
 
+      - name: Setup Custom Maven
+        uses: ./.github/actions/setup-custom-maven
+
       - name: Release keystore file
         run: base64 -d <<< "${{ secrets.KEYSTORE_FILE_BASE64 }}" > arcaea_offline.jks
 
@@ -39,17 +42,11 @@ jobs:
         run: ./gradlew assembleUnstableRelease
 
       - name: Verify APK signing
-        run: |
-          # Locate the latest build tools
-          BUILD_TOOLS_VERSION=$(ls $ANDROID_HOME/build-tools/ | sort -V | tail -n 1)
-          # Adding build tools to PATH for this step only
-          PATH=$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION:$PATH
-
-          apksigner verify --verbose --min-sdk-version 24 app/build/outputs/apk/unstable/release/app-unstable-arm64-v8a-release.apk
-          apksigner verify --verbose --min-sdk-version 24 app/build/outputs/apk/unstable/release/app-unstable-armeabi-v7a-release.apk
-          apksigner verify --verbose --min-sdk-version 24 app/build/outputs/apk/unstable/release/app-unstable-x86_64-release.apk
-          apksigner verify --verbose --min-sdk-version 24 app/build/outputs/apk/unstable/release/app-unstable-x86-release.apk
-          apksigner verify --verbose --min-sdk-version 24 app/build/outputs/apk/unstable/release/app-unstable-universal-release.apk
+        run: bash .github/scripts/verify-apk-signing.sh
+
+      - name: Verify custom-built libs in APK
+        continue-on-error: true
+        run: bash .github/scripts/verify-custom-libs.sh
 
       - name: Upload build result artifact (arm64-v8a)
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

.github/workflows/check.yml

@@ -29,6 +29,9 @@ jobs:
       - name: Setup Toolchain
         uses: ./.github/actions/setup-toolchain
 
+      - name: Setup Custom Maven
+        uses: ./.github/actions/setup-custom-maven
+
       - name: Release local.properties file
         run: cp local.defaults.properties local.properties
 

.github/workflows/connected-android-test.yml

@@ -35,6 +35,9 @@ jobs:
       - name: Setup Toolchain
         uses: ./.github/actions/setup-toolchain
 
+      - name: Setup Custom Maven
+        uses: ./.github/actions/setup-custom-maven
+
       - name: Release local.properties file
         run: cp local.defaults.properties local.properties
 

.gitignore

@@ -5,6 +5,9 @@ app/src/main/assets/ocr/model*.onnx
 app/src/main/assets/ocr/model*.ort
 app/src/main/assets/ocr/model_info.json
 
+# Local maven repo (custom-built artifacts: onnxruntime, opencv)
+/maven-local/
+
 # Android Studio added
 /.idea/caches
 /.idea/libraries

README.md

@@ -0,0 +1,13 @@
+# Arcaea Offline Android Client
+
+## Custom Maven Repo (Optional)
+
+To reduce APK size, this project builds custom ONNX Runtime and OpenCV in [ArcaeaOffline/custom-lib-builds](https://github.com/ArcaeaOffline/custom-lib-builds), with unused features removed.
+
+`settings.gradle.kts` gives the local maven repo the highest priority, simply download the matching artifacts from the custom-lib-builds Releases and unpack them.
+
+If the local maven repo does not exist, Gradle falls back to Maven Central. This only affects APK size, not functionality.
+
+## License
+
+[GPL-3.0](LICENSE)