Merge pull request #4021 from element-hq/rav/build_sdk_for_local_machine

Build SDK for the local hardware

Author: bmarty

docs/_developer_onboarding.md

@@ -130,9 +130,9 @@ Prerequisites:
   ```
   cargo install cargo-ndk
   ```
-* Install the Android Rust toolchain:
+* Install the Android Rust toolchain for your machine's hardware:
   ```
-  rustup target add aarch64-linux-android
+  rustup target add aarch64-linux-android x86_64-linux-android
   ```
 * Depending on the location of the Android SDK, you may need to set
   `ANDROID_HOME`:

tools/sdk/build_rust_sdk.sh

@@ -59,6 +59,13 @@ buildApp=${buildApp:-no}
 
 cd "${elementPwd}"
 
+default_arch="$(uname -m)-linux-android"
+# On ARM MacOS, `uname -m` returns arm64, but the toolchain is called aarch64
+default_arch="${default_arch/arm64/aarch64}"
+
+read -p "Enter the architecture you want to build for (default '$default_arch'): " target_arch
+target_arch="${target_arch:-${default_arch}}"
+
 # If folder ../matrix-rust-components-kotlin does not exist, clone the repo
 if [ ! -d "../matrix-rust-components-kotlin" ]; then
     printf "\nFolder ../matrix-rust-components-kotlin does not exist. Cloning the repository into ../matrix-rust-components-kotlin.\n\n"
@@ -71,8 +78,8 @@ git reset --hard
 git checkout main
 git pull
 
-printf "\nBuilding the SDK for aarch64-linux-android...\n\n"
-./scripts/build.sh -p "${rustSdkPath}" -m sdk -t aarch64-linux-android -o "${elementPwd}/libraries/rustsdk"
+printf "\nBuilding the SDK for ${target_arch}...\n\n"
+./scripts/build.sh -p "${rustSdkPath}" -m sdk -t "${target_arch}" -o "${elementPwd}/libraries/rustsdk"
 
 cd "${elementPwd}"
 mv ./libraries/rustsdk/sdk-android-debug.aar ./libraries/rustsdk/matrix-rust-sdk.aar