From a6bfc52a6fa2d181833bbc422740e8a69b2f930a Mon Sep 17 00:00:00 2001 From: nig Date: Thu, 2 Jan 2025 13:47:01 +0100 Subject: [PATCH] update android sdk build instructions --- tuta-sdk/android/sdk/build.gradle.kts | 2 +- tuta-sdk/rust/README.md | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tuta-sdk/android/sdk/build.gradle.kts b/tuta-sdk/android/sdk/build.gradle.kts index 5767ebfae235..2b8cdd57824a 100644 --- 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 = "26.1.10909125" + ndkVersion = "28.0.12674087 rc2" } dependencies { diff --git a/tuta-sdk/rust/README.md b/tuta-sdk/rust/README.md index 7179e965eeec..75642aebaa66 100644 --- a/tuta-sdk/rust/README.md +++ b/tuta-sdk/rust/README.md @@ -5,11 +5,15 @@ You need at least NDK 23 ``` +# install the android NDK +Android Studio -> Android SDK Manager -> SDK Tools -> NDK (Side by Side) -> Install + # install the android targets for rust (part of rust-tuta pkg on dev machines) 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) -export ANDROID_NDK_HOME=/opt/android-sdk-linux/ndk/26.1.10909125 +# 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 + # add NDK toolchain to path export PATH=${PATH}:${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/ @@ -18,7 +22,7 @@ export PATH=${PATH}:${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bi # setup the sdk project - open tutanota-3/tutasdk/android in Android Studio -- Ctrl + A -> Project setup -> select the NDK +- Ctrl + A -> Project Structure -> Modules -> SDK -> select the NDK - gradle sync # add sdk/android to the app-android project as a library