diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2017-09-07 10:48:45 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2017-09-07 14:16:41 +0000 |
| commit | 82ed3b8ca5ab5c47efde39083fe0ad12bdcafa7f (patch) | |
| tree | a363cc6ae517c13aca0feadc26aed24fd9ee395d /mkspecs | |
| parent | 3fe08097967a4adfa8b523869339a706af649f64 (diff) | |
Android: Use unified headers if available
Fix compile with ndkr16+
Change-Id: I52a52b787e88c8fd74f86d98dcd3c9d44fcf56a9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 21afc52f2c..c8145ae66b 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -17,8 +17,12 @@ ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_ ANDROID_STDCPP_PATH = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libgnustl_shared.so ANDROID_CXX_STL_LIBS = -lgnustl_shared -lgcc -QMAKE_CFLAGS += --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \ - -isystem $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/include \ +exists($$NDK_ROOT/sysroot/usr/include): \ + QMAKE_CFLAGS += --sysroot=$$NDK_ROOT/sysroot \ + -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX +else: QMAKE_CFLAGS += --sysroot=$$ANDROID_PLATFORM_ROOT_PATH + +QMAKE_CFLAGS += -isystem $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/include \ -isystem $$ANDROID_SOURCES_CXX_STL_LIBDIR/include equals(ANDROID_TARGET_ARCH, armeabi)|equals(ANDROID_TARGET_ARCH, armeabi-v7a): \ |