Revert "Android: Compile with NDK r18 + clang"

This broke the build for qtlocation.

This reverts commit 176a216f4f.

Task-number: QTBUG-70779
Change-Id: Ifd8419ffb88c1a9009319f39b11b4529b143477e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Liang Qi 2018-09-28 11:55:12 +02:00
parent 05e2690009
commit 1fa5d83ad2

View File

@ -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