diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-27 14:54:28 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-05-27 17:41:28 -0700 |
| commit | 01d610b383c597e61e5209f5c38b6d6a1c09d12e (patch) | |
| tree | b275e1cc895dd03a03fb44b59de21cb9da8ce0c3 /packaging/android/android-build-wrapper.sh | |
| parent | 9d1ebffe1f078c254c09a49dbccff5a2d6d60ad7 (diff) | |
| download | subsurface-01d610b383c597e61e5209f5c38b6d6a1c09d12e.tar.gz | |
Update Android build scripts
- 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>
Diffstat (limited to 'packaging/android/android-build-wrapper.sh')
| -rw-r--r-- | packaging/android/android-build-wrapper.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index e532c7a21..dcc2ec493 100644 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -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 |