diff options
| -rw-r--r-- | src/android/templates/build.gradle | 1 | ||||
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index fd7ce34aa9..7a77517681 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -73,5 +73,6 @@ android { resConfig "en" minSdkVersion qtMinSdkVersion targetSdkVersion qtTargetSdkVersion + ndk.abiFilters = qtTargetAbiList.split(",") } } diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 1d314099a2..b88e772fc8 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2560,7 +2560,13 @@ bool buildAndroidProject(const Options &options) gradleProperties["qtTargetSdkVersion"] = options.targetSdkVersion; if (gradleProperties["androidBuildToolsVersion"].isEmpty()) gradleProperties["androidBuildToolsVersion"] = options.sdkBuildToolsVersion.toLocal8Bit(); - + QString abiList; + for (auto it = options.architectures.constBegin(); it != options.architectures.constEnd(); ++it) { + if (abiList.size()) + abiList.append(u","); + abiList.append(it.key()); + } + gradleProperties["qtTargetAbiList"] = abiList.toLocal8Bit();// armeabi-v7a or arm64-v8a or ... if (!mergeGradleProperties(gradlePropertiesPath, gradleProperties)) return false; |