build: update Android NDK to r30 (30.0.14904198)
This commit is contained in:
@@ -41,12 +41,10 @@ jobs:
|
|||||||
- name: Android SDK
|
- name: Android SDK
|
||||||
uses: android-actions/setup-android@v3
|
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
|
# 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.
|
# 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 —
|
run: sdkmanager "platform-tools" "platforms;android-37" "build-tools;37.0.0" "ndk;30.0.14904198" "cmake;3.22.1"
|
||||||
# "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"
|
|
||||||
|
|
||||||
- name: Caches (cargo + gradle)
|
- name: Caches (cargo + gradle)
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ clients/android/ Gradle project (this dir)
|
|||||||
|
|
||||||
## Prerequisites (already set up on the dev Mac)
|
## 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)
|
- **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`
|
- Rust + `rustup target add aarch64-linux-android x86_64-linux-android` + `cargo install cargo-ndk`
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ plugins {
|
|||||||
id("com.android.library")
|
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 {
|
android {
|
||||||
namespace = "io.unom.punktfunk.kit"
|
namespace = "io.unom.punktfunk.kit"
|
||||||
|
|||||||
Reference in New Issue
Block a user