diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml index e9e06a8319..c9a9149d48 100644 --- a/metadata/com.b44t.messenger.yml +++ b/metadata/com.b44t.messenger.yml @@ -590,25 +590,41 @@ Builds: build: $$NDK$$/ndk-build -j `nproc` ndk: r14b - - versionName: 1.0.2 - versionCode: 570 - commit: v1.0.2 - submodules: true - gradle: - - fat - prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle - build: $$NDK$$/ndk-build -j `nproc` - ndk: r14b - - versionName: 1.0.3 versionCode: 571 commit: v1.0.3 submodules: true gradle: - fat + srclibs: + - rustup@1.21.1 prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle - build: $$NDK$$/ndk-build -j `nproc` - ndk: r14b + build: + - cd jni/deltachat-core-rust + - ../../$$rustup$$/rustup-init.sh -y + - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ + - source $HOME/.cargo/env + - rustup default $(cat rust-toolchain) + - rustup target add aarch64-linux-android + - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config + - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"' + >> $HOME/.cargo/config + - rustup target add i686-linux-android + - echo "[target.i686-linux-android]" >> $HOME/.cargo/config + - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"' + >> $HOME/.cargo/config + - rustup target add armv7-linux-androideabi + - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config + - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"' + >> $HOME/.cargo/config + - rustup target add x86_64-linux-android + - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config + - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"' + >> $HOME/.cargo/config + - cd ../.. + - sed -i -e 's/rm /rm -f /g' ndk-make.sh + - ./ndk-make.sh + ndk: r20b AutoUpdateMode: Version v%v UpdateCheckMode: Tags ^v[0-9]+\.[0-9]+\.[0-9]+$