From f85777eca41d09849a182a210269edb8202e5c01 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/nightly.yml | 10 +++++----- android-project/app/build.gradle | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b5a983dab00..828f28afc26 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -505,19 +505,19 @@ jobs: # Removing it will cause gradle to fall back on 3.18.1 installed by the Android SDK #- name: Remove system CMake # run: rm /usr/local/bin/cmake - - name: Accept SDK licenses - run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses + #- 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@v3 # 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 ab937fe25ab..07e31103765 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' // ndkVersion '25.2.9519653' compileSdk 35 aaptOptions { // probably does not matter...