From 1fa5d83ad286ce0cc4e3147780e224a0ae040a92 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 28 Sep 2018 11:55:12 +0200 Subject: [PATCH] Revert "Android: Compile with NDK r18 + clang" This broke the build for qtlocation. This reverts commit 176a216f4f6c36c769e9b667c12717c277a003ca. Task-number: QTBUG-70779 Change-Id: Ifd8419ffb88c1a9009319f39b11b4529b143477e Reviewed-by: Jani Heikkinen --- mkspecs/android-clang/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index 953b13dc37..b665000d00 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -40,7 +40,7 @@ QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH ANDROID_STDCPP_PATH = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++_shared.so -ANDROID_CXX_STL_LIBS = -lc++_shared +ANDROID_CXX_STL_LIBS = -lc++ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz