diff options
Diffstat (limited to 'mkspecs/features/android')
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 10 | ||||
| -rw-r--r-- | mkspecs/features/android/default_pre.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/android/sdk.prf | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index b77d1f2653..8437e1542b 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -78,8 +78,14 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { contains(resource, ".*qmake_qmake_immediate\\.qrc$") { # They will be created for each architecture, since they could be different # we need to account for all of them - for (arch, ANDROID_ABIS): \ - rescopy += $$absolute_path("qmake_qmake_immediate.qrc", $$OUT_PWD/$$arch) + qmake_qrc_path = "qmake_qmake_immediate.qrc" + base_out_path = $$OUT_PWD/$$RCC_DIR + multi_android_abi { + for (arch, ANDROID_ABIS): \ + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path/$$arch) + } else { + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path) + } } else { contains(resource, ".*\\.qrc$"): rescopy += $$absolute_path($$resource, $$_PRO_FILE_PWD_) } diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf index eaa2b0c666..2328b728ac 100644 --- a/mkspecs/features/android/default_pre.prf +++ b/mkspecs/features/android/default_pre.prf @@ -36,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. @@ -73,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 diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf index 463d399a21..83428ae7d7 100644 --- a/mkspecs/features/android/sdk.prf +++ b/mkspecs/features/android/sdk.prf @@ -1,6 +1,6 @@ API_VERSION_TO_USE = $$(ANDROID_API_VERSION) isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION -isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-28 +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-31 ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar !exists($$ANDROID_JAR_FILE) { |