ci use ndk: 26.1.10909125

tutao · Jan 2, 2025 · 1b57416 · 1b57416
1 parent 9024461
commit 1b57416
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/app-android/app/build.gradle b/app-android/app/build.gradle
@@ -107,6 +107,7 @@ android {
 	}
 
 	namespace 'de.tutao.tutanota'
+	ndkVersion '26.1.10909125'
 }
 
 tasks.withType(Test).configureEach {

diff --git a/app-android/calendar/build.gradle.kts b/app-android/calendar/build.gradle.kts
@@ -152,6 +152,7 @@ android {
 			assets.srcDirs(files("$projectDir/schemas"))
 		}
 	}
+	ndkVersion = "26.1.10909125"
 }
 
 dependencies {

diff --git a/app-android/tutashared/build.gradle.kts b/app-android/tutashared/build.gradle.kts
@@ -70,6 +70,7 @@ android {
 	sourceSets {
 		this.getByName("debug").assets.srcDirs(files("$projectDir/schemas"))
 	}
+	ndkVersion = "26.1.10909125"
 }
 
 dependencies {

diff --git a/tuta-sdk/android/sdk/build.gradle.kts b/tuta-sdk/android/sdk/build.gradle.kts
@@ -82,7 +82,7 @@ android {
 		jvmTarget = "1.8"
 	}
 	sourceSets["main"].java.srcDirs(file("${layout.buildDirectory.asFile.get()}/generated-sources/tuta-sdk"))
-	ndkVersion = "28.0.12674087 rc2"
+	ndkVersion = "26.1.10909125"
 }
 
 dependencies {

diff --git a/tuta-sdk/rust/README.md b/tuta-sdk/rust/README.md
@@ -12,7 +12,7 @@ Android Studio -> Android SDK Manager -> SDK Tools -> NDK (Side by Side) -> Inst
 rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
 
 # add ANDROID_NDK_HOME to your shell profile (.bashrc). the version depends on your NDK version.
-export ANDROID_NDK_HOME=/opt/android-sdk-linux/ndk/28.0.12674087
+export ANDROID_NDK_HOME=/opt/android-sdk-linux/ndk/26.1.10909125
 
 # add NDK toolchain to path
 export PATH=${PATH}:${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,7 @@ android { @@
     	}
     	namespace 'de.tutao.tutanota'
+    	ndkVersion '26.1.10909125'
     }
     tasks.withType(Test).configureEach {
@@ Expand Down @@