diff options
Diffstat (limited to 'mkspecs/features/android/default_pre.prf')
| -rw-r--r-- | mkspecs/features/android/default_pre.prf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf index a73cd4b39c..2328b728ac 100644 --- a/mkspecs/features/android/default_pre.prf +++ b/mkspecs/features/android/default_pre.prf @@ -8,6 +8,9 @@ build_pass:armeabi-v7a { QT_ARCH = x86 } else:build_pass:x86_64 { QT_ARCH = x86_64 +} else:count(ALL_ANDROID_ABIS, 1) { + QT_ARCH = $$ALL_ANDROID_ABIS + CONFIG += single_android_abi $$QT_ARCH } else { # default architecture QT_ARCH = arm64-v8a @@ -33,6 +36,9 @@ QMAKE_CFLAGS += -fno-limit-debug-info QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS +equals(ANDROID_TARGET_ARCH, armeabi-v7a): \ + QMAKE_LINK += -Wl,--exclude-libs,libunwind.a + ANDROID_STDCPP_PATH = $$NDK_LLVM_PATH/sysroot/usr/lib/ # -fstack-protector-strong offers good protection against stack smashing attacks. @@ -70,8 +76,6 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux- else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android- else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi- -QMAKE_RANLIB = $${CROSS_COMPILE}ranlib -QMAKE_LINK_SHLIB = $$QMAKE_LINK QMAKE_LFLAGS = QMAKE_LIBS_PRIVATE = -llog -lz -lm -ldl -lc |