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 +-------- scripts/get-dep-lib.sh | 4 ++++ 2 files changed, 5 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 diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index ba669305f..15796ae80 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -17,6 +17,7 @@ CURRENT_KIRIGAMI="8691651c1f0d09430416ba5fe2130647554b06a9" CURRENT_BREEZE_ICONS="" CURRENT_GRANTLEE="v5.0.0" CURRENT_MDBTOOLS="master" +CURRENT_QT_ANDROID_CMAKE="master" # Checkout library from git # Ensure specified version is checked out, @@ -191,6 +192,9 @@ for package in "${PACKAGES[@]}" ; do mdbtools) git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git ;; + qt-android-cmake) + git_checkout_library qt-android-cmake $CURRENT_QT_ANDROID_CMAKE https://github.com/LaurentGomila/qt-android-cmake.git + ;; *) echo "unknown package \"$package\"" exit 1 -- cgit v1.2.3-70-g09d2