From ebcb063fa02ca39c331ff565e81337eb2251df35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Forlini?= <niccolo.forlini@proton.ch>
Date: Thu, 16 Oct 2025 15:52:02 +0200
Subject: [PATCH] Set ndkVersion explicitly

NOJIRA
---
 app-configuration.properties                                    | 1 +
 app/build.gradle.kts                                            | 2 +-
 .../protonmail/android/mail/plugin/ApplicationConfigPlugin.kt   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-configuration.properties b/app-configuration.properties
index 76f6fd011e..b9581749ed 100644
--- a/app-configuration.properties
+++ b/app-configuration.properties
@@ -2,6 +2,7 @@ applicationId=ch.protonmail.android
 compileSdk=35
 minSdk=29
 targetSdk=35
+ndkVersion=28.1.13356709
 testInstrumentationRunner=ch.protonmail.android.uitest.HiltTestRunner
 versionCode=1
 versionName=7.0.15
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 830e9c406b..227fedc83a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,7 +16,6 @@
  * along with Proton Mail. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import java.util.Properties
 import com.android.build.api.dsl.VariantDimension
 import configuration.extensions.protonEnvironment
 
@@ -54,6 +53,7 @@ android {
         applicationId = AppConfiguration.applicationId.get()
         minSdk = AppConfiguration.minSdk.get()
         targetSdk = AppConfiguration.targetSdk.get()
+        ndkVersion = AppConfiguration.ndkVersion.get()
         versionCode = AppConfiguration.versionCode.get()
         versionName = AppConfiguration.versionName.get()
 
diff --git a/build-plugin/src/main/kotlin/ch/protonmail/android/mail/plugin/ApplicationConfigPlugin.kt b/build-plugin/src/main/kotlin/ch/protonmail/android/mail/plugin/ApplicationConfigPlugin.kt
index 772c182b0f..321ed91717 100644
--- a/build-plugin/src/main/kotlin/ch/protonmail/android/mail/plugin/ApplicationConfigPlugin.kt
+++ b/build-plugin/src/main/kotlin/ch/protonmail/android/mail/plugin/ApplicationConfigPlugin.kt
@@ -37,6 +37,7 @@ abstract class ConfigExtension(project: Project) {
     abstract val compileSdk: Property<Int>
     abstract val minSdk: Property<Int>
     abstract val targetSdk: Property<Int>
+    abstract val ndkVersion: Property<String>
     abstract val testInstrumentationRunner: Property<String>
     abstract val versionCode: Property<Int>
     abstract val versionName: Property<String>
@@ -52,6 +53,7 @@ abstract class ConfigExtension(project: Project) {
         compileSdk.convention(properties.getProperty("compileSdk").toInt())
         minSdk.convention(properties.getProperty("minSdk").toInt())
         targetSdk.convention(properties.getProperty("targetSdk").toInt())
+        ndkVersion.convention(properties.getProperty("ndkVersion"))
         testInstrumentationRunner.convention(properties.getProperty("testInstrumentationRunner"))
         versionCode.convention(properties.getProperty("versionCode").toInt())
         versionName.convention(properties.getProperty("versionName"))