aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2022-06-23 10:26:34 +0300
committerhjk <hjk@qt.io>2022-06-23 08:44:58 +0000
commit0ce0ad6cf9a5d9cc66007a05cad55e6f07f99dc1 (patch)
tree5be5c2d895d61057f43461c9a861578f963808a1
parent8bb22fa4f3864ce8b4ce00eddd3205ecd416695e (diff)
Add android-build/libs/<ABI> to solibSearchPath
All android libs that can be loaded are placed in android-build/libs/ <abi>/. These libs are not stripped anymore, so let's add also this folder to solibSearchPath. Change-Id: I34de8bf7ee68725903fd7250a39b407c6ae57cac Reviewed-by: hjk <hjk@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
-rw-r--r--src/plugins/android/androiddebugsupport.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 055c8d8f8fc..2cc37d7e931 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -145,6 +145,11 @@ void AndroidDebugSupport::start()
if (activeRunConfig)
solibSearchPath.append(activeRunConfig->buildTargetInfo().workingDirectory.toString());
solibSearchPath.append(buildDir.toString());
+ const auto androidLibsPath = AndroidManager::androidBuildDirectory(target)
+ .pathAppended("libs")
+ .pathAppended(AndroidManager::apkDevicePreferredAbi(target))
+ .toString();
+ solibSearchPath.append(androidLibsPath);
solibSearchPath.removeDuplicates();
setSolibSearchPath(solibSearchPath);
qCDebug(androidDebugSupportLog) << "SoLibSearchPath: "<<solibSearchPath;