diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-07-07 21:16:19 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-07-10 09:38:13 +0000 |
| commit | 0ef46b41d86b9fad4fc4a18bd577d208afa1fce8 (patch) | |
| tree | 363d92977e42670d2a089eb8c26fec7d5726f40f /mkspecs/features | |
| parent | c92528b6cc502a541d5b55daf27c2d78d883d26a (diff) | |
Android: Enable configuring for a single abi architecture
Fixes: QTBUG-80938
Pick-to: 5.15
Change-Id: Id87202e6b2520b18c6b06b71675157f588a28bd6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/android/default_pre.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/android/resolve_config.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_android_deps.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf index a73cd4b39c..f7383c386c 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 += singleAndroidAbi $$QT_ARCH } else { # default architecture QT_ARCH = arm64-v8a diff --git a/mkspecs/features/android/resolve_config.prf b/mkspecs/features/android/resolve_config.prf index 0cc4e73cc9..14749abcc0 100644 --- a/mkspecs/features/android/resolve_config.prf +++ b/mkspecs/features/android/resolve_config.prf @@ -1,6 +1,6 @@ load(resolve_config) -!equals(TEMPLATE, aux):!host_build:!single_arch:!java:android { +!equals(TEMPLATE, aux):!host_build:!single_arch:!java:!singleAndroidAbi:android { isEmpty(ANDROID_ABIS): ANDROID_ABIS = $$ALL_ANDROID_ABIS ALL_ABIS = $$join(ANDROID_ABIS, _and_) diff --git a/mkspecs/features/qt_android_deps.prf b/mkspecs/features/qt_android_deps.prf index 354e40ed23..a316c59069 100644 --- a/mkspecs/features/qt_android_deps.prf +++ b/mkspecs/features/qt_android_deps.prf @@ -15,8 +15,7 @@ ANDROID_DEPENDS_DIR = $$MODULE_BASE_OUTDIR/lib/ DEPENDENCY_FILE = $$ANDROID_DEPENDS_DIR$$TARGET-android-dependencies.xml - -build_pass:!isEmpty(QT_ARCH): { +build_pass|singleAndroidAbi:!isEmpty(QT_ARCH): { !isEmpty(MODULE_PLUGIN_TYPES) { for(PLUGIN_TYPE, MODULE_PLUGIN_TYPES) { ANDROID_BUNDLED_FILES += "plugins/$$PLUGIN_TYPE" diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 2bb01515be..56fc12015b 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -58,7 +58,7 @@ win32|CONFIG(static, static|shared) { "QMAKE_DEPENDS_$${ucmodule}_LD =$$join(LD_USES, " ", " ")" \ "QMAKE_INCDIR_$${ucmodule} = $$val_escape(MODULE_INCLUDEPATH)" \ "QMAKE_DEFINES_$${ucmodule} = $$val_escape(MODULE_DEFINES)" - android { + !singleAndroidAbi:android { MODULE_PRI_CONT += "QMAKE_LIBS_$${ucmodule} =" } else: if(msvc|qtConfig(debug_and_release)): { win32: \ |