diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-12-24 12:58:29 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-12-24 13:50:59 -0800 |
| commit | 9df88f0145f45b8a4de5788509f58f17060e6b5d (patch) | |
| tree | 402a6bfa0659b9693fa16c27798a73b49f27c3e5 /packaging/android | |
| parent | f067d3b5d67bcc7ee1bfec9b85d8dc8269b490c6 (diff) | |
| download | subsurface-9df88f0145f45b8a4de5788509f58f17060e6b5d.tar.gz | |
Android build: reorder downloading Qt vs SDK
Since it's the SDK where things are failing, doing it this way makes the
turnaround time of my attempts to fix this faster. And in the larger
scheme of things, the order is irrelevant.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android')
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index b5a34d47e..8a99aa54e 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -60,20 +60,7 @@ if [ "$MISSING" ] ; then exit 1 fi -# download the Qt installer including Android bits and unpack / install -QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES} -if [ ! -d Qt ] ; then - if [ ! -f ${QT_BINARIES} ] ; then - wget -q ${QT_DOWNLOAD_URL} - fi - chmod +x ./${QT_BINARIES} - ./${QT_BINARIES} --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations -fi - -# patch the cmake / Qt5.7.1 incompatibility mentioned above -sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/' Qt/${LATEST_QT}/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake - -# next we need to get the Android SDK and NDK +# first we need to get the Android SDK and NDK if [ ! -d $ANDROID_NDK ] ; then if [ ! -f $NDK_BINARIES ] ; then wget -q https://dl.google.com/android/repository/$NDK_BINARIES @@ -94,6 +81,19 @@ if [ ! -d $ANDROID_SDK ] ; then popd fi +# download the Qt installer including Android bits and unpack / install +QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES} +if [ ! -d Qt ] ; then + if [ ! -f ${QT_BINARIES} ] ; then + wget -q ${QT_DOWNLOAD_URL} + fi + chmod +x ./${QT_BINARIES} + ./${QT_BINARIES} --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations +fi + +# patch the cmake / Qt5.7.1 incompatibility mentioned above +sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/' Qt/${LATEST_QT}/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake + if [ ! -d subsurface/libdivecomputer/src ] ; then pushd subsurface git submodule init |