Merge branch 'main' into update-gh-actions

maplibre · Nov 6, 2024 · d0f2e20 · d0f2e20
2 parents 0ab7f9d + f31e18a
commit d0f2e20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/library-android.yml b/.github/workflows/library-android.yml
@@ -16,13 +16,6 @@ jobs:
           targets: x86_64-linux-android aarch64-linux-android i686-linux-android
       - name: Install Dependencies
         uses: ./.github/actions/install-system-dependencies
-      - name: Set NDK Version
-        shell: bash
-        run: |
-          ANDROID_ROOT=/usr/local/lib/android
-          ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
-          ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
-          ln -sfn $ANDROID_SDK_ROOT/ndk/25.2.9519653 $ANDROID_NDK_ROOT
       - name: Build
         shell: bash
         run: just build-android

diff --git a/android/gradle/lib/build.gradle b/android/gradle/lib/build.gradle
@@ -7,7 +7,8 @@ plugins {
 apply plugin: 'kotlin-android'
 
 android {
-    ndkVersion "27.0.12077973"
+    // Also update NDK in library-android.yml
+    ndkVersion "27.2.12479018"
 
     compileSdkVersion 31