mirror of
https://github.com/sudoxnym/fdroiddata.git
synced 2026-07-14 10:11:43 +00:00
Merge branch 'master' into 'master'
Trying to build delta chat with rust Closes #1889 See merge request fdroid/fdroiddata!6132
This commit is contained in:
commit
bed05e6c09
1 changed files with 28 additions and 12 deletions
|
|
@ -590,25 +590,41 @@ Builds:
|
||||||
build: $$NDK$$/ndk-build -j `nproc`
|
build: $$NDK$$/ndk-build -j `nproc`
|
||||||
ndk: r14b
|
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
|
- versionName: 1.0.3
|
||||||
versionCode: 571
|
versionCode: 571
|
||||||
commit: v1.0.3
|
commit: v1.0.3
|
||||||
submodules: true
|
submodules: true
|
||||||
gradle:
|
gradle:
|
||||||
- fat
|
- fat
|
||||||
|
srclibs:
|
||||||
|
- rustup@1.21.1
|
||||||
prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle
|
prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle
|
||||||
build: $$NDK$$/ndk-build -j `nproc`
|
build:
|
||||||
ndk: r14b
|
- 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
|
AutoUpdateMode: Version v%v
|
||||||
UpdateCheckMode: Tags ^v[0-9]+\.[0-9]+\.[0-9]+$
|
UpdateCheckMode: Tags ^v[0-9]+\.[0-9]+\.[0-9]+$
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue