diff options
Diffstat (limited to 'mkspecs/features/android/android.prf')
| -rw-r--r-- | mkspecs/features/android/android.prf | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 6990417536..87fdd763e4 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -1,8 +1,10 @@ APK_PATH = $$shell_path($$OUT_PWD/android-build/$${TARGET}.apk) +TARGET_FOR_ANDROID_DEPLOYMENT_SETTINGS = $$TARGET + !contains(TEMPLATE, subdirs): { apk_install_target.target = apk_install_target apk_install_target.depends = first - apk_install_target.commands = $(MAKE) -f $(MAKEFILE) INSTALL_ROOT=$$OUT_PWD/android-build install + apk_install_target.commands = $(MAKE) -f $(MAKEFILE) INSTALL_ROOT=$$shell_path($$OUT_PWD/android-build) install qtPrepareTool(ANDROIDDEPLOYQT, androiddeployqt) isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json @@ -21,7 +23,12 @@ APK_PATH = $$shell_path($$OUT_PWD/android-build/$${TARGET}.apk) prepareRecursiveTarget(apk_install_target) } -build_pass { +# Apply Android arch specific settings in the following cases: +# - build_pass == true aka Qt was configured with multi-ABI (2+ arches) +# - single_android_abi == true aka Qt was configuring with a single ABI / arch +# modifications are omitted when building config.tests +# during Qt configuration, by checkking for the presence of single_arch +build_pass|if(single_android_abi:!single_arch) { contains(TEMPLATE, ".*app") { !android_app { !contains(TARGET, ".so") { @@ -35,11 +42,13 @@ build_pass { INSTALLS *= target } } - } else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install { + } else: contains(TEMPLATE, "lib"):!QTDIR_build:android_install { tmpvar = $$str_member($$TARGET, -$$str_size($${QT_ARCH}), -1) !equals(tmpvar, $${QT_ARCH}): TARGET = $${TARGET}_$${QT_ARCH} - target.path = /libs/$$ANDROID_TARGET_ARCH/ - INSTALLS *= target + !static { + target.path = /libs/$$ANDROID_TARGET_ARCH/ + INSTALLS *= target + } } } else { android-build-distclean.commands = \ |