summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-11-13 17:17:54 +0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-11-13 17:17:54 +0800
commit9da3988ec6529c4730c4cf274d37d5b116971630 (patch)
tree4f93b1961ee5dc2cc9d4f797d709bf904ccba7f4
parentc608cfd643e247130e30f93e2bda86623da4e430 (diff)
downloadsubsurface-9da3988ec6529c4730c4cf274d37d5b116971630.tar.gz
Android: pick the correct C++ runtime
Yet another fallout of the switch to the NDK toolchain. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rwxr-xr-xpackaging/android/build.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index dac16ab0d..99c33b1bc 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -402,6 +402,7 @@ cmake $MOBILE_CMAKE \
-DANDROID_PLATFORM="android-16" \
-DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK_ROOT"/build/cmake/android.toolchain.cmake \
-DQT_ANDROID_CMAKE="$BUILDROOT"/qt-android-cmake/AddQtAndroidApk.cmake \
+ -DANDROID_STL="gnustl_shared" \
-DFORCE_LIBSSH=OFF \
-DLIBDC_FROM_PKGCONFIG=ON \
-DLIBGIT2_FROM_PKGCONFIG=ON \