Merge branch 'master' into 'master'

Fixed build 1.25.1-27 of ru.meefik.busybox

As of 1.25.1-27 the app ru.meefik.busybox uses static builds busybox, so the build process has to build static binaries.
Fixes https://github.com/meefik/busybox/issues/21

This fix is not tested, as I'm not able to use fdroidserver.

See merge request !1820
This commit is contained in:
est 2016-11-11 17:07:33 +00:00
commit 84bdf2b0a1

View file

@ -75,14 +75,11 @@ Build:1.25.1,27
scandelete=app/src/main/assets scandelete=app/src/main/assets
build=cd ../contrib && \ build=cd ../contrib && \
export ANDROID_NDK_ROOT=$$NDK$$ && \ export ANDROID_NDK_ROOT=$$NDK$$ && \
./bb-build.sh arm pie && \ ./bb-build.sh arm static && \
./bb-build.sh arm nopie && \
cp -fR compiled/arm ../app/src/main/assets/ && \ cp -fR compiled/arm ../app/src/main/assets/ && \
./bb-build.sh intel pie && \ ./bb-build.sh intel static && \
./bb-build.sh intel nopie && \
cp -fR compiled/intel ../app/src/main/assets/ && \ cp -fR compiled/intel ../app/src/main/assets/ && \
./bb-build.sh mips pie && \ ./bb-build.sh mips static && \
./bb-build.sh mips nopie && \
cp -fR compiled/mips ../app/src/main/assets/ cp -fR compiled/mips ../app/src/main/assets/
Auto Update Mode:None Auto Update Mode:None