mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Android build scripts

Browse source 
- prepare for Qt 5.9
- remove references to ANT
- adjust to changed location of the resulting apk

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-05-27 14:54:28 -07:00
parent 9d1ebffe1f
commit 01d610b383
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packaging/android/android-build-wrapper.sh
View file

@ -122,7 +122,7 @@ fi
((BUILDNR++))
echo "${BUILDNR}" > ./buildnr.dat
echo "Building Subsurface-mobile ${VERSION} for Android, build nr ${BUILDNR} as Subsurface-mobile-$VERSION-${NAME}arm.apk"
echo "Building Subsurface-mobile ${VERSION} for Android, build nr ${BUILDNR} as Subsurface-mobile-${VERSION}-arm.apk"
if [ "$1" = release ] || [ "$1" = Release ] || [ "$1" = debug ] || [ "$1" = Debug ] ; then
RELEASE=$1
@ -131,14 +131,14 @@ else
RELEASE=Debug
fi
rm -f ./subsurface-mobile-build-arm/bin/QtApp-debug.apk
rm -f ./subsurface-mobile-build-arm/build/outputs/apk/*.apk
rm -d ./subsurface-mobile-build-arm/AndroidManifest.xml
rm -d ./subsurface-mobile-build-arm/bin/AndroidManifest.xml
if [ "$USE_X" ] ; then
bash "$USE_X" subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@"
else
bash subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@"
fi
ls -l ./subsurface-mobile-build-arm/bin/*.apk
ls -l ./subsurface-mobile-build-arm/build/outputs/apk/*.apk