diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-28 11:55:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-28 13:46:11 +0000 |
| commit | 1fa5d83ad286ce0cc4e3147780e224a0ae040a92 (patch) | |
| tree | bf8f60c6fea7ae3e65634b3a1bc6b74ba3094331 | |
| parent | 05e2690009553d3faaf04ef8927fc072c652dd52 (diff) | |
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 <jani.heikkinen@qt.io>
| -rw-r--r-- | mkspecs/android-clang/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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 |