From f4b6b549a061378599ba681d63cdd3c57a9a3993 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 27 Nov 2024 00:24:29 +0100 Subject: [PATCH] Move Android NDK from RC to LTS --- .github/workflows/Android.yml | 9 +++------ android-project/app/build.gradle | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml index 9fc9528f1d8..5c524b0d172 100644 --- a/.github/workflows/Android.yml +++ b/.github/workflows/Android.yml @@ -36,19 +36,16 @@ jobs: distribution: 'adopt' cache: gradle - - name: Accept SDK licenses - run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses - - name: Install CMake run: | - $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.31.0" + $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.31.0" - name: Cache CMake build folder uses: actions/cache@v4 with: path: android-project/app/.cxx - key: ${{ github.workflow }}-v5-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v5- + key: ${{ github.workflow }}-v4-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v4- - name: Build working-directory: ${{github.workspace}} diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle index ca83de10325..8ba1908ecea 100644 --- a/android-project/app/build.gradle +++ b/android-project/app/build.gradle @@ -7,7 +7,7 @@ if (buildAsApplication) { } android { - ndkVersion '28.0.12433566' + ndkVersion '27.2.12479018' compileSdk 35 defaultConfig { if (buildAsApplication) {