diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2017-11-15 22:03:03 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-16 10:23:00 -0800 |
| commit | 9dd87bac039d18c8d53b64e15f367327ae1dd42c (patch) | |
| tree | 0cfed30355c97616b21592a299a8333e844df3e2 /packaging | |
| parent | f3924aea290e5fb57bf97767691053ec2780a5a7 (diff) | |
| download | subsurface-9dd87bac039d18c8d53b64e15f367327ae1dd42c.tar.gz | |
android: Remove unneeded extra argument parsing
This is handled by build.sh, which handles it correctly for running with
set -u.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 95ec63c8b..7420f9a0f 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -117,7 +117,6 @@ if ! git checkout Subsurface-branch ; then fi popd - # and now we need a monotonic build number... if [ ! -f ./buildnr.dat ] ; then BUILDNR=0 @@ -129,20 +128,13 @@ echo "${BUILDNR}" > ./buildnr.dat echo "Building Subsurface-mobile for Android, build nr ${BUILDNR}" -if [ "$1" = release ] || [ "$1" = Release ] || [ "$1" = debug ] || [ "$1" = Debug ] ; then - RELEASE=$1 - shift -else - RELEASE=Debug -fi - rm -f ./subsurface-mobile-build-arm/build/outputs/apk/*.apk rm -df ./subsurface-mobile-build-arm/AndroidManifest.xml if [ "$USE_X" ] ; then - bash "$USE_X" subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@" + bash "$USE_X" subsurface/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" else - bash subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@" + bash subsurface/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" fi ls -l ./subsurface-mobile-build-arm/build/outputs/apk/*.apk |