diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-11-13 13:16:29 +0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-11-13 13:16:29 +0800 |
| commit | 1868bd38b6958d4bccefd64759b63e360ae6524a (patch) | |
| tree | a7214b788edcfb5607f2d1f375d5e56d17143fe8 /packaging/android | |
| parent | a316ed6e6c53b2fc67d3e947b17e8dee97422a30 (diff) | |
| download | subsurface-1868bd38b6958d4bccefd64759b63e360ae6524a.tar.gz | |
Android: qt-android-cmake no longer ships a toolchain file
Instead use the one that comes as part of the NDK.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android')
| -rwxr-xr-x | packaging/android/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 657832458..25cdbdd48 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -398,7 +398,7 @@ cmake $MOBILE_CMAKE \ -DPKG_CONFIG_EXECUTABLE="$PKGCONF" \ -DQT_ANDROID_SDK_ROOT="$ANDROID_SDK_ROOT" \ -DQT_ANDROID_NDK_ROOT="$ANDROID_NDK_ROOT" \ - -DCMAKE_TOOLCHAIN_FILE="$BUILDROOT"/qt-android-cmake/toolchain/android.toolchain.cmake \ + -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK_ROOT"/build/cmake/android.toolchain.cmake \ -DQT_ANDROID_CMAKE="$BUILDROOT"/qt-android-cmake/AddQtAndroidApk.cmake \ -DFORCE_LIBSSH=OFF \ -DLIBDC_FROM_PKGCONFIG=ON \ |