Changeset 9df88f0 in subsurface


Ignore:
Timestamp:
Dec 24, 2017, 1:50:59 PM (4 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
5eec251
Parents:
f067d3b
git-author:
Dirk Hohndel <dirk@…> (12/24/17 12:58:29)
git-committer:
Dirk Hohndel <dirk@…> (12/24/17 13:50:59)
Message:

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packaging/android/android-build-wrapper.sh

    r7388a81 r9df88f0  
    6161fi
    6262
    63 # download the Qt installer including Android bits and unpack / install
    64 QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES}
    65 if [ ! -d Qt ] ; then
    66         if [ ! -f ${QT_BINARIES} ] ; then
    67                 wget -q ${QT_DOWNLOAD_URL}
    68         fi
    69         chmod +x ./${QT_BINARIES}
    70         ./${QT_BINARIES} --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
    71 fi
    72 
    73 # patch the cmake / Qt5.7.1 incompatibility mentioned above
    74 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
    75 
    76 # next we need to get the Android SDK and NDK
     63# first we need to get the Android SDK and NDK
    7764if [ ! -d $ANDROID_NDK ] ; then
    7865        if [ ! -f $NDK_BINARIES ] ; then
     
    9481        popd
    9582fi
     83
     84# download the Qt installer including Android bits and unpack / install
     85QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES}
     86if [ ! -d Qt ] ; then
     87        if [ ! -f ${QT_BINARIES} ] ; then
     88                wget -q ${QT_DOWNLOAD_URL}
     89        fi
     90        chmod +x ./${QT_BINARIES}
     91        ./${QT_BINARIES} --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
     92fi
     93
     94# patch the cmake / Qt5.7.1 incompatibility mentioned above
     95sed -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
    9696
    9797if [ ! -d subsurface/libdivecomputer/src ] ; then
Note: See TracChangeset for help on using the changeset viewer.