Merge branch 'update-ndk-to-version-27b-droid-1343'

24 files changed, 29 insertions, 8 deletions

diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md
index 39cf2ad771..c80214f013 100644
--- a/android/BuildInstructions.md
+++ b/android/BuildInstructions.md
@@ -118,10 +118,10 @@ Linux distro:
 
   ```bash
   cd "$ANDROID_HOME"  # Or some other directory to place the Android NDK
-  wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
-  unzip android-ndk-r25c-linux.zip
+  wget https://dl.google.com/android/repository/android-ndk-r27b-linux.zip
+  unzip android-ndk-r27b-linux.zip
 
-  cd android-ndk-r25c
+  cd android-ndk-r27b
   export ANDROID_NDK_HOME="$PWD"
   ```
 
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 811d9eef1f..bb290ac89e 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -33,6 +33,7 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace = "net.mullvad.mullvadvpn"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig {
         val localProperties = gradleLocalProperties(rootProject.projectDir, providers)
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 432a66e9b8..0493fa92a3 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -1,8 +1,9 @@
 object Versions {
     const val jvmTarget = "17"
-    const val compileSdkVersion = 34
+    const val compileSdkVersion = 35
+    const val buildToolsVersion = "35.0.0"
     const val minSdkVersion = 26
-    const val targetSdkVersion = 34
+    const val targetSdkVersion = 35
 
     const val junitJupiter = "5.10.2"
     const val junit5Android = "1.5.0"
diff --git a/android/docs/BuildInstructions.macos.md b/android/docs/BuildInstructions.macos.md
index cf26a297d8..a88db7f227 100644
--- a/android/docs/BuildInstructions.macos.md
+++ b/android/docs/BuildInstructions.macos.md
@@ -38,7 +38,7 @@ Open Android Studio -> Tools -> SDK Manager, and install `Android SDK Command-li
 
 Install the necessary Android SDK tools
 ```bash
-~/Library/Android/sdk/cmdline-tools/latest/bin/sdkmanager "platforms;android-33" "build-tools;30.0.3" "platform-tools" "ndk;25.2.9519653"
+~/Library/Android/sdk/cmdline-tools/latest/bin/sdkmanager "platforms;android-35" "build-tools;35.0.0" "platform-tools" "ndk;27.1.12297006"
 ```
 
 Install Android targets
@@ -50,7 +50,7 @@ Export the following environmental variables, and possibly store them for exampl
 `~/.zprofile` or `~/.zshrc` file:
 ```bash
 export ANDROID_HOME="$HOME/Library/Android/sdk"
-export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/25.2.9519653"
+export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/27.1.12297006"
 export NDK_TOOLCHAIN_DIR="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin"
 export AR_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/llvm-ar"
 export AR_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/llvm-ar"
diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts
index c901bd53dd..e6753a306a 100644
--- a/android/lib/billing/build.gradle.kts
+++ b/android/lib/billing/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.billing"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig {
         minSdk = Versions.minSdkVersion
diff --git a/android/lib/common-test/build.gradle.kts b/android/lib/common-test/build.gradle.kts
index aa0b13f76c..33107baba5 100644
--- a/android/lib/common-test/build.gradle.kts
+++ b/android/lib/common-test/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.common.test"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/common/build.gradle.kts b/android/lib/common/build.gradle.kts
index 0bc10aa6c4..a686f023a1 100644
--- a/android/lib/common/build.gradle.kts
+++ b/android/lib/common/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.common"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/daemon-grpc/build.gradle.kts b/android/lib/daemon-grpc/build.gradle.kts
index 661e4e0d99..d8b02aad1d 100644
--- a/android/lib/daemon-grpc/build.gradle.kts
+++ b/android/lib/daemon-grpc/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.daemon.grpc"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts
index 2a20310281..cf632b1419 100644
--- a/android/lib/endpoint/build.gradle.kts
+++ b/android/lib/endpoint/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.endpoint"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/intent-provider/build.gradle.kts b/android/lib/intent-provider/build.gradle.kts
index ca88d7f26f..03cafa5970 100644
--- a/android/lib/intent-provider/build.gradle.kts
+++ b/android/lib/intent-provider/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.intent"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts
index ceef054d35..8367a435de 100644
--- a/android/lib/map/build.gradle.kts
+++ b/android/lib/map/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.map"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts
index 0a19eecee5..543852a360 100644
--- a/android/lib/model/build.gradle.kts
+++ b/android/lib/model/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.model"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig {
         minSdk = Versions.minSdkVersion
diff --git a/android/lib/payment/build.gradle.kts b/android/lib/payment/build.gradle.kts
index 6e4b9292d7..8fda0feacd 100644
--- a/android/lib/payment/build.gradle.kts
+++ b/android/lib/payment/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.payment"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig {
         minSdk = Versions.minSdkVersion
diff --git a/android/lib/resource/build.gradle.kts b/android/lib/resource/build.gradle.kts
index c2547d1beb..9a208f29eb 100644
--- a/android/lib/resource/build.gradle.kts
+++ b/android/lib/resource/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.resource"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/shared/build.gradle.kts b/android/lib/shared/build.gradle.kts
index a6cb6ef371..1665c2c663 100644
--- a/android/lib/shared/build.gradle.kts
+++ b/android/lib/shared/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.shared"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts
index 353621b30b..3b4d422af8 100644
--- a/android/lib/talpid/build.gradle.kts
+++ b/android/lib/talpid/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.talpid"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts
index 22387a5e8c..592cb25337 100644
--- a/android/lib/theme/build.gradle.kts
+++ b/android/lib/theme/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.lib.theme"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/service/build.gradle.kts b/android/service/build.gradle.kts
index 58d8757df0..2fbca92cb7 100644
--- a/android/service/build.gradle.kts
+++ b/android/service/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.service"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/test/arch/build.gradle.kts b/android/test/arch/build.gradle.kts
index 01922ac2de..085ad8d835 100644
--- a/android/test/arch/build.gradle.kts
+++ b/android/test/arch/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.test.arch"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 26195ecb39..31b8cfa67a 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.test.common"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index 4250793efc..8f4e9c2e0d 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.test.e2e"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig {
         minSdk = Versions.minSdkVersion
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index fa24be000e..5a571bd4fc 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.test.mockapi"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig {
         minSdk = Versions.minSdkVersion
diff --git a/android/tile/build.gradle.kts b/android/tile/build.gradle.kts
index cb2806d0e0..b3f21e5be9 100644
--- a/android/tile/build.gradle.kts
+++ b/android/tile/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = "net.mullvad.mullvadvpn.tile"
     compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig { minSdk = Versions.minSdkVersion }
 
diff --git a/building/android-container-image.txt b/building/android-container-image.txt
index 4a37c25bf7..2b2c1042c1 100644
--- a/building/android-container-image.txt
+++ b/building/android-container-image.txt
@@ -1 +1 @@
-ghcr.io/mullvad/mullvadvpn-app-build-android:7b4ffb683
+ghcr.io/mullvad/mullvadvpn-app-build-android:c5db11836