From 98bc22d9e9d721c982f2061dcdcbc49b795d4816 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Tue, 25 Nov 2025 13:46:25 +0800 Subject: [PATCH] Upgrade ndk (#1687) --- .github/workflows/PR.yml | 6 ------ .github/workflows/android.yml | 6 ------ app/build.gradle.kts | 4 ++-- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index 576cc48848..733d9dc7a1 100644 --- a/.github/workflows/PR.yml +++ b/.github/workflows/PR.yml @@ -28,11 +28,6 @@ jobs: distribution: 'temurin' java-version: '17' cache: 'gradle' - - name: Setup Android SDK - uses: android-actions/setup-android@v3 - - uses: seanmiddleditch/gha-setup-ninja@master - with: - version: 1.12.0 - name: Set up ccache uses: hendrikmuhs/ccache-action@v1.2 with: @@ -40,7 +35,6 @@ jobs: restore-keys: ${{ runner.os }} - name: Build with Gradle run: | - sudo rm -rf $ANDROID_HOME/cmake echo 'org.gradle.caching=true' >> gradle.properties echo 'org.gradle.parallel=true' >> gradle.properties echo 'org.gradle.vfs.watch=true' >> gradle.properties diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0920d75134..3458560a94 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -23,11 +23,6 @@ jobs: distribution: 'temurin' java-version: 17 cache: 'gradle' - - name: Setup Android SDK - uses: android-actions/setup-android@v3 - - uses: seanmiddleditch/gha-setup-ninja@master - with: - version: 1.12.0 - name: Retrieve version run: | echo VERSION=$(echo ${{ github.event.head_commit.id }} | head -c 10) >> $GITHUB_ENV @@ -49,7 +44,6 @@ jobs: fi - name: Build with Gradle run: | - sudo rm -rf $ANDROID_HOME/cmake echo 'org.gradle.caching=true' >> gradle.properties echo 'org.gradle.parallel=true' >> gradle.properties echo 'org.gradle.vfs.watch=true' >> gradle.properties diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 55ff0841f6..74bcd72b78 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -52,7 +52,7 @@ android { namespace = "me.iacn.biliroaming" compileSdk = 35 buildToolsVersion = "35.0.0" - ndkVersion = "27.2.12479018" + ndkVersion = "29.0.14206865" buildFeatures { prefab = true @@ -120,7 +120,7 @@ android { externalNativeBuild { cmake { path("src/main/jni/CMakeLists.txt") - version = "3.28.0+" + version = "4.1.0+" } } }