diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-04-23 08:23:19 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-04-25 13:18:41 -0700 |
| commit | f112be7a619e93e20341d1ed92681cd8077e2798 (patch) | |
| tree | fb50aecc1f8dd5f6887ace9df60577a4bf05f629 /packaging/android/android-build-wrapper.sh | |
| parent | c0ecd3a5979ebff83089a41270e5450b60b8a131 (diff) | |
| download | subsurface-f112be7a619e93e20341d1ed92681cd8077e2798.tar.gz | |
build-system/Android: use install-qt.sh to install Qt
The official installer now requires the user to log in which we can't
really do in a scripted manner. Let's see how long this way of
installing things will be available.
While doing this remove an ancient hack of some Qt settings that we no
longer need.
This also tries to prune some things that we don't need in the Docker
image to reduce image size.
The mapbox plugin is removed as it would add a dependency to QtSql which
we otherwise don't need. And since the plugin isn't used, no point in
installing it.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android/android-build-wrapper.sh')
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index a361d8e41..f7152596b 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -53,7 +53,6 @@ PLATFORM=$(uname) export SUBSURFACE_SOURCE="$SCRIPTDIR"/../.. if [ "$PLATFORM" = Linux ] ; then - QT_BINARIES=qt-opensource-linux-x64-${LATEST_QT}.run NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip SDK_TOOLS=sdk-tools-linux-${SDK_VERSION}.zip else @@ -117,24 +116,21 @@ fi # due to https://bugreports.qt.io/browse/QTBUG-69494 cp "$ANDROID_SDK"/platforms/"${ANDROID_PLATFORM}"/data/fonts/Roboto-Regular.ttf "$SUBSURFACE_SOURCE"/android-mobile || exit 1 -# 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/"${LATEST_QT}"/android_armv7 ] ; then - if [ -d Qt ] ; then - # Over writing an exsisting installation stalls the installation script, - # rename the exsisting Qt folder and notify then user. - mv Qt Qt_OLD - echo "Qt installation found, backing it up to Qt_OLD." - fi - if [ ! -f "${QT_BINARIES}" ] ; then - wget -q "${QT_DOWNLOAD_URL}" - fi - chmod +x ./"${QT_BINARIES}" - ./"${QT_BINARIES}" --platform minimal --script "$SCRIPTDIR"/qt-installer-noninteractive.qs --no-force-installations + # download the Qt installer including Android bits and unpack / install + bash "$SCRIPTDIR"/install-qt.sh --version ${LATEST_QT} --target android --toolchain android_armv7 \ + qtbase qtdeclarative qttranslations qttools qtsvg \ + qtquickcontrols qtquickcontrols2 qtlocation qtimageformats \ + qtgraphicaleffects qtconnectivity qtandroidextras \ + --directory Qt +fi +if [ ! -d Qt/"${LATEST_QT}"/android_arm64_v8a ] ; then + bash "$SCRIPTDIR"/install-qt.sh --version ${LATEST_QT} --target android --toolchain android_arm64_v8a \ + qtbase qtdeclarative qttranslations qttools qtsvg \ + qtquickcontrols qtquickcontrols2 qtlocation qtimageformats \ + qtgraphicaleffects qtconnectivity qtandroidextras \ + --directory Qt fi - -# patch the cmake / Qt5.7.1 incompatibility mentioned above -sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# &/' Qt/"${LATEST_QT}"/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake if [ ! -z ${PREP_ONLY+x} ] ; then exit 0 |