diff --git a/.gitea/workflows/android.yml b/.gitea/workflows/android.yml index 246e7e9..93c2f24 100644 --- a/.gitea/workflows/android.yml +++ b/.gitea/workflows/android.yml @@ -41,12 +41,10 @@ jobs: - name: Android SDK uses: android-actions/setup-android@v3 - - name: NDK r28 LTS + platform 36 + build-tools + CMake (libopus cross-build) + - name: NDK r30 + platform 37 + build-tools + CMake (libopus cross-build) # cmake;3.22.1 installs cmake + ninja under $ANDROID_SDK/cmake/3.22.1/bin — the exact path # kit/build.gradle.kts prepends to PATH for cargo-ndk's audiopus_sys (libopus) CMake build. - # Keep platforms;android-36 (android-37 isn't in the runner's sdkmanager channel yet — - # "Failed to find package"); AGP auto-installs the compileSdk-37 platform during the build. - run: sdkmanager "platform-tools" "platforms;android-36" "build-tools;36.0.0" "ndk;28.2.13676358" "cmake;3.22.1" + run: sdkmanager "platform-tools" "platforms;android-37" "build-tools;37.0.0" "ndk;30.0.14904198" "cmake;3.22.1" - name: Caches (cargo + gradle) uses: actions/cache@v4 diff --git a/clients/android/README.md b/clients/android/README.md index 77fb8be..987613f 100644 --- a/clients/android/README.md +++ b/clients/android/README.md @@ -32,7 +32,7 @@ clients/android/ Gradle project (this dir) ## Prerequisites (already set up on the dev Mac) -- Android SDK + **NDK r28 LTS** (`28.2.13676358`), `platforms;android-37.0`, `build-tools;37.0.0` +- Android SDK + **NDK r30** (`30.0.14904198`), `platforms;android-37.0`, `build-tools;37.0.0` - **JDK 21** for Gradle/AGP (the machine default JDK 25 is too new for AGP 9.2) - Rust + `rustup target add aarch64-linux-android x86_64-linux-android` + `cargo install cargo-ndk` diff --git a/clients/android/kit/build.gradle.kts b/clients/android/kit/build.gradle.kts index ee5c550..b4af79d 100644 --- a/clients/android/kit/build.gradle.kts +++ b/clients/android/kit/build.gradle.kts @@ -7,7 +7,7 @@ plugins { id("com.android.library") } -val ndkVer = "28.2.13676358" // r28 LTS — matches the SDK NDK installed for cargo-ndk +val ndkVer = "30.0.14904198" // r30-beta1 — matches the SDK NDK installed for cargo-ndk android { namespace = "io.unom.punktfunk.kit"