Browse Source

Improve and fix build_rust_sdk.sh after PR review

pull/1582/head
Benoit Marty 11 months ago
parent
commit
21e24990c4
  1. 5
      libraries/matrix/impl/build.gradle.kts
  2. 6
      tools/sdk/build_rust_sdk.sh

5
libraries/matrix/impl/build.gradle.kts

@ -29,11 +29,12 @@ anvil { @@ -29,11 +29,12 @@ anvil {
}
dependencies {
releaseImplementation(libs.matrix.sdk)
if (file("${rootDir.path}/libraries/rustsdk/matrix-rust-sdk.aar").exists()) {
println("\nNote: Using local binary of the Rust SDK.\n")
implementation(projects.libraries.rustsdk)
debugImplementation(projects.libraries.rustsdk)
} else {
implementation(libs.matrix.sdk)
debugImplementation(libs.matrix.sdk)
}
implementation(projects.libraries.di)
implementation(projects.libraries.androidutils)

6
tools/sdk/build_rust_sdk.sh

@ -46,7 +46,7 @@ fi @@ -46,7 +46,7 @@ fi
read -p "Do you want to build the app after (yes/no) default to yes? " buildApp
buildApp=${buildApp:-yes}
# If folder ../matrix-rust-components-kotlin does not exist, close the repo
# 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"
git clone https://github.com/matrix-org/matrix-rust-components-kotlin.git ../matrix-rust-components-kotlin
@ -58,7 +58,7 @@ git reset --hard @@ -58,7 +58,7 @@ git reset --hard
git checkout main
git pull
printf "\nBuilding the SDK...\n\n"
printf "\nBuilding the SDK for aarch64-linux-android...\n\n"
./scripts/build.sh -p ${rustSdkPath} -m sdk -t aarch64-linux-android -o ../element-x-android/libraries/rustsdk
cd ../element-x-android
@ -67,7 +67,7 @@ mkdir -p ./libraries/rustsdk/sdks @@ -67,7 +67,7 @@ mkdir -p ./libraries/rustsdk/sdks
cp ./libraries/rustsdk/matrix-rust-sdk.aar ./libraries/rustsdk/matrix-rust-sdk-${date}.aar
if [ ${buildApp} != "yes" ]; then
if [ ${buildApp} == "yes" ]; then
printf "\nBuilding the application...\n\n"
./gradlew assembleDebug
fi

Loading…
Cancel
Save