From a1feba9458435a2739669baebda4a8ff8fec719b Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Wed, 21 May 2025 16:29:48 -0700
Subject: [PATCH] fix(android): Bump Android NDK and build target (#9198)

Android recently bumped their default page size to 16 KB, which requires
an updated NDK to successfully build connlib.

See https://developer.android.com/guide/practices/page-sizes
---
 .github/actions/setup-android/action.yml | 2 +-
 kotlin/android/app/build.gradle.kts      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/setup-android/action.yml b/.github/actions/setup-android/action.yml
index f12dc207a..a64ec7114 100644
--- a/.github/actions/setup-android/action.yml
+++ b/.github/actions/setup-android/action.yml
@@ -18,7 +18,7 @@ runs:
     - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
 
     - name: Install NDK
-      run: sdkmanager "ndk;27.2.12479018" # Must match `kotlin/android/app/build.gradle.kts`
+      run: sdkmanager "ndk;28.1.13356709" # Must match `kotlin/android/app/build.gradle.kts`
       shell: bash
 
     - name: Validate Gradle wrapper
diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts
index 93dee7abb..f2dfa64de 100644
--- a/kotlin/android/app/build.gradle.kts
+++ b/kotlin/android/app/build.gradle.kts
@@ -43,14 +43,14 @@ android {
     }
 
     namespace = "dev.firezone.android"
-    compileSdk = 35
-    ndkVersion = "27.2.12479018" // Must match `.github/actions/setup-android/action.yml`
+    compileSdk = 36
+    ndkVersion = "28.1.13356709" // Must match `.github/actions/setup-android/action.yml`
 
     defaultConfig {
         applicationId = "dev.firezone.android"
         // Android 8
         minSdk = 26
-        targetSdk = 35
+        targetSdk = 36
         versionCode = (System.currentTimeMillis() / 1000 / 10).toInt()
         // mark:next-android-version
         versionName = "1.4.9"