diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2017-02-06 15:55:40 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-06 21:15:33 -0800 |
| commit | bed5ad31e6c0df3db27ed252b75b11b93c95f935 (patch) | |
| tree | 7a9ac83973374069076d5c636e4048289856c409 /packaging | |
| parent | 9d235d165ec435a20d55ddf2a7072bd255be060e (diff) | |
| download | subsurface-bed5ad31e6c0df3db27ed252b75b11b93c95f935.tar.gz | |
android-wrapper: Auto install Qt
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/android-build-wrapper.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 3db028452..cb98fc9ef 100644 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -24,6 +24,10 @@ ANDROID_SDK=android-sdk-linux PLATFORM=$(uname) +pushd "$(dirname "$0")/../../" +export SUBSURFACE_SOURCE=$PWD +popd + if [ "$PLATFORM" = "Linux" ] ; then QT_BINARIES=qt-opensource-linux-x64-android-${LATEST_QT}.run NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip @@ -57,9 +61,8 @@ if [ ! -d Qt ] ; then if [ ! -f ${QT_BINARIES} ] ; then wget -q ${QT_DOWNLOAD_URL} fi - echo "In the binary installer select $(pwd)/Qt as install directory" chmod +x ./${QT_BINARIES} - ./${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 |