diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-11-21 15:03:17 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-12-01 02:24:05 +0000 |
| commit | 03262625a2ad1133efd19d1e4a73962fb386dfde (patch) | |
| tree | a28f548d12c99fa22f33de17809e1d531af3ad9d | |
| parent | e48e2ed9d77ca2f4285af32226cd7ed736879b1e (diff) | |
Remove QMAKE_RANLIB and QMAKE_LINK_SHLIB from android/default_pre.prf
The values should come from android-clang mkspecs. The hardcoded
values don't work correctly with recent Android NDKs.
Fixes: QTBUG-108662
Change-Id: Ie153a50ee0c49bd4f0704b588a4e2c87a05c1063
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 49f62e8c5a8aef4c0b7fd6867a30e653d2f5dd98)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | mkspecs/features/android/default_pre.prf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf index 9f90dcb391..2328b728ac 100644 --- a/mkspecs/features/android/default_pre.prf +++ b/mkspecs/features/android/default_pre.prf @@ -76,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 |