From d7b70ae5dd29ca2ed19f0551f3049931d9c53f8b Mon Sep 17 00:00:00 2001
From: Ian VanSchooten <ian.vanschooten@gmail.com>
Date: Mon, 7 Oct 2024 15:20:47 -0400
Subject: [PATCH] Specify correct ndk version

---
 .github/workflows/release.yml | 9 ---------
 android/app/build.gradle      | 3 +++
 nebula/Makefile               | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1f2d192..3d66aa4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,14 +26,6 @@ jobs:
         with:
           flutter-version: '3.24.1'
 
-      - uses: nttld/setup-ndk@v1
-        id: setup-ndk
-        with:
-          ndk-version: r21b
-          # r21b is 21.1.6352462, if it is not published here https://developer.android.com/ndk/downloads
-          # or here https://github.com/android/ndk/wiki/Unsupported-Downloads then you must download them and look at
-          # source.properties to determine the version
-
       - name: Check out code
         uses: actions/checkout@v3
 
@@ -112,7 +104,6 @@ jobs:
       - name: Build Android
         env:
           TOKEN: ${{ secrets.MACHINE_USER_PAT }}
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
           GOOGLE_PLAY_KEYSTORE_PASSWORD: ${{ secrets.GOOGLE_PLAY_KEYSTORE_PASSWORD }}
         run: |
           flutter build appbundle --build-number="$BUILD_NUMBER" --build-name="$BUILD_NAME"
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1f8ad57..53d6fc8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -28,6 +28,9 @@ android {
 
     compileSdkVersion 34
 
+    // default ndk version for AGP 8.5: https://developer.android.com/build/releases/past-releases/agp-8-5-0-release-notes
+    ndkVersion "26.1.10909125"
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
diff --git a/nebula/Makefile b/nebula/Makefile
index 3d95d0c..00c5434 100644
--- a/nebula/Makefile
+++ b/nebula/Makefile
@@ -7,7 +7,7 @@ clean:
 
 mobileNebula.aar: *.go go.sum
 	go get -d golang.org/x/mobile/cmd/gomobile
-	gomobile bind -trimpath -v --target=android
+	gomobile bind -trimpath -v --target=android -androidapi 26
 
 MobileNebula.xcframework: *.go go.sum
 	go get -d golang.org/x/mobile/cmd/gomobile