summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2021-03-23 18:51:36 +0100
committerAndreas Buhr <andreas.buhr@qt.io>2021-09-30 17:27:16 +0200
commit07cfab07a2a489e021b56226824a2d9b1211fad7 (patch)
tree6d98728b92b8661d127b964347d39a8645978cd6 /src/android
parent725b52141d553590d395d51963ee8b60f99ca40d (diff)
Specify Android architecture in gradle files
When building for armeabi-v7a, building and APK using "ninja foo_make_apk" works. Building it by calling "gradlew assembleDebug" works. Opening the "android-build" folder in Android Studio and clicking the "Build" button works. But clicking the "Run" or "Debug" button in Android Studio does not work when the attached phone is arm64-v8a. Then Android Studio automatically selects the v8 architecture which does not find the Qt libraries. This patch adds explicit ABI selection to the gradle configuration files. With explicit ABI selection, Android Studio does not try to outsmart you. Pick-to: 6.2 Fixes: QTBUG-96701 Task-number: QTBUG-87022 Change-Id: I4ad6356c38b7eca004c0e0dbbb357cab7de84c0f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/templates/build.gradle1
1 files changed, 1 insertions, 0 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(",")
}
}