From 1868bd38b6958d4bccefd64759b63e360ae6524a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 13 Nov 2018 13:16:29 +0800 Subject: 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 --- packaging/android/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging/android') 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 \ -- cgit v1.2.3-70-g09d2