diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-25 09:16:13 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-02 08:04:49 -0700 |
| commit | 7fa25de58a3429c1103fcaec0c2e0e4a7ef22ccc (patch) | |
| tree | 8820ecc85ce0f69e5b36307af2f47ecd7c8a3ae7 | |
| parent | 285f5661ea1c54ae4238a92f1684fd9daffcab2a (diff) | |
| download | subsurface-7fa25de58a3429c1103fcaec0c2e0e4a7ef22ccc.tar.gz | |
Android: allow passing through -quick argument
So even setups relying on the wrapper script can do faster rebuilds.
This also cleans up a bug that made passing through the release
parameter fail in the past, and removes overly verbose debugging output.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index ef56cb575..d74b025ac 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -16,6 +16,8 @@ exec 1> >(tee ./build.log) 2>&1 USE_X=$(case $- in *x*) echo "-x" ;; esac) +QUICK="" +RELEASE="" # deal with the command line arguments while [[ $# -gt 0 ]] ; do @@ -25,8 +27,13 @@ while [[ $# -gt 0 ]] ; do # only download the dependencies, don't build PREP_ONLY="1" ;; + -quick) + # pass through to build.sh + QUICK="-quick" + ;; release|Release) - # simply pass through to build.sh + # pass through to build.sh + RELEASE="release" ;; *) echo "Unknown command line argument $arg" @@ -103,8 +110,6 @@ fi # now that we have an NDK, copy the font that we need for OnePlus phones # due to https://bugreports.qt.io/browse/QTBUG-69494 -ls -l . "$ANDROID_SDK" "$ANDROID_SDK"/platforms -ls -l "$ANDROID_SDK"/platforms/"${ANDROID_PLATFORM}" "$ANDROID_SDK"/platforms/"${ANDROID_PLATFORM}"/data/fonts/Roboto-Regular.ttf cp "$ANDROID_SDK"/platforms/"${ANDROID_PLATFORM}"/data/fonts/Roboto-Regular.ttf "$SUBSURFACE_SOURCE"/android-mobile || exit 1 # download the Qt installer including Android bits and unpack / install @@ -159,17 +164,17 @@ rm -f ./subsurface-mobile-build-arm/build/outputs/apk/debug/*.apk rm -df ./subsurface-mobile-build-arm/AndroidManifest.xml if [ "$USE_X" ] ; then - bash "$USE_X" "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" + bash "$USE_X" "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm $QUICK $RELEASE # the arm64 APK has to have a higher build number BUILDNR=$((BUILDNR+1)) echo "${BUILDNR}" > ./buildnr.dat - bash "$USE_X" "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 "$@" + bash "$USE_X" "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 $QUICK $RELEASE else - bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" + bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm $QUICK $RELEASE # the arm64 APK has to have a higher build number BUILDNR=$((BUILDNR+1)) echo "${BUILDNR}" > ./buildnr.dat - bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 "$@" + bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 $QUICK $RELEASE fi ls -l ./subsurface-mobile-build-arm/build/outputs/apk/debug/*.apk |