XCSoar: fix 6.8.8, 6.8.9b and 6.8.10

"make TARGET=ANDROIDFAT" fails, build only for ARMv7.
This commit is contained in:
relan 2017-12-26 10:46:18 +03:00
parent e5005c5c8e
commit e3f12127c8

View file

@ -147,33 +147,30 @@ Build:6.8.7,107
Build:6.8.8,108
commit=v6.8.8
subdir=android
submodules=yes
output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
build=cd .. && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
break; done
ndk=r10e
sudo=apt-get install -y g++
output=output/ANDROID7/opt/build/unsigned.apk
rm=android/ioio/software/IOIODude/lib,android/ioio/software/IOIOLib/target/pc/lib,android/ioio/software/applications/IOIOConnectionTester/lib
build=make TARGET=ANDROID7 DEBUG=n TESTING=n -j`nproc`
ndk=r15c
Build:6.8.9b,110
commit=v6.8.9b
subdir=android
submodules=yes
output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
build=cd .. && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
break; done
ndk=r10e
sudo=apt-get install -y g++
output=output/ANDROID7/opt/build/unsigned.apk
rm=android/ioio/software/IOIODude/lib,android/ioio/software/IOIOLib/target/pc/lib,android/ioio/software/applications/IOIOConnectionTester/lib
build=make TARGET=ANDROID7 DEBUG=n TESTING=n -j`nproc`
ndk=r15c
Build:6.8.10,111
commit=v6.8.10
subdir=android
submodules=yes
output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
build=cd .. && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
break; done
ndk=r10e
sudo=apt-get install -y g++
output=output/ANDROID7/opt/build/unsigned.apk
rm=android/ioio/software/IOIODude/lib,android/ioio/software/IOIOLib/target/pc/lib,android/ioio/software/applications/IOIOConnectionTester/lib
build=make TARGET=ANDROID7 DEBUG=n TESTING=n -j`nproc`
ndk=r15c
Maintainer Notes:
The makefile setup is not perfect, so we need to run it a few times to get it to succeed.