diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-27 10:01:00 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-27 10:38:39 -0400 |
| commit | 651f63282fd82e4f04b3edd6bfe987a88b746525 (patch) | |
| tree | 3e1f276f057f21fff3c3b329c8646b5094c272a2 /packaging | |
| parent | 01cd2e224f4648023a57aa688f2403ca78a88390 (diff) | |
| download | subsurface-651f63282fd82e4f04b3edd6bfe987a88b746525.tar.gz | |
build-system: switch back to upstream qt-android-cmake
And in the process use our script to do the work.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/android/build.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index c43b40232..657832458 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -354,14 +354,7 @@ if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] || [ ! -e "$PKG_CONFIG_LIBDIR/libdivec echo "$CURRENT_SHA" > "libdivecomputer-${ARCH}.SHA" fi -if [ ! -e qt-android-cmake ] ; then - git clone https://github.com/dirkhh/qt-android-cmake.git -else - pushd qt-android-cmake - git checkout QMLfix - git pull - popd -fi +"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . qt-android-cmake # the Qt Android cmake addon runs androiddeployqt with '--verbose' which # is, err, rather verbose. Let's not do that. sed -i -e 's/--verbose//' qt-android-cmake/AddQtAndroidApk.cmake |