Changeset ceba803 in subsurface


Ignore:
Timestamp:
Dec 24, 2017, 1:25:25 PM (4 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Children:
940a417
Parents:
39e47d4
git-author:
Dirk Hohndel <dirk@…> (12/24/17 12:58:29)
git-committer:
Dirk Hohndel <dirk@…> (12/24/17 13:25:25)
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

    r39e47d4 rceba803  
    6363fi
    6464
    65 # download the Qt installer including Android bits and unpack / install
    66 QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES}
    67 if [ ! -d Qt ] ; then
    68         if [ ! -f ${QT_BINARIES} ] ; then
    69                 wget -q ${QT_DOWNLOAD_URL}
    70         fi
    71         chmod +x ./${QT_BINARIES}
    72         ./${QT_BINARIES} --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
    73 fi
    74 
    75 # patch the cmake / Qt5.7.1 incompatibility mentioned above
    76 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
    77 
    78 # next we need to get the Android SDK and NDK
     65# first we need to get the Android SDK and NDK
    7966if [ ! -d $ANDROID_NDK ] ; then
    8067        if [ ! -f $NDK_BINARIES ] ; then
     
    9784        popd
    9885fi
     86
     87# download the Qt installer including Android bits and unpack / install
     88QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES}
     89if [ ! -d Qt ] ; then
     90        if [ ! -f ${QT_BINARIES} ] ; then
     91                wget -q ${QT_DOWNLOAD_URL}
     92        fi
     93        chmod +x ./${QT_BINARIES}
     94        ./${QT_BINARIES} --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
     95fi
     96
     97# patch the cmake / Qt5.7.1 incompatibility mentioned above
     98sed -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
    9999
    100100if [ ! -d subsurface/libdivecomputer/src ] ; then
Note: See TracChangeset for help on using the changeset viewer.