From 651f63282fd82e4f04b3edd6bfe987a88b746525 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 27 Oct 2018 10:01:00 -0400 Subject: 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 --- packaging/android/build.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'packaging/android') 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 -- cgit v1.2.3-70-g09d2