diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2019-01-05 21:31:54 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-01-07 12:00:49 +0000 |
| commit | da43362921a62ea3163a042be20ec0f550d05cfa (patch) | |
| tree | ba298027af806fcaf4cd54ce9634790f984b5016 | |
| parent | 52e0d9e23c3f7a1b0faf6649cf3dd825bcfd4f08 (diff) | |
Fix libs dir location on arm64
On Android arm64 the native libs are not in /data/app/../libs/... anymore but they are moved
to some random location, so, trying to load the libs from old location will fail.
Fixes: QTBUG-72616
Fixes: QTBUG-71027
Change-Id: I70263c8ae2d014999fbc78f40bd9b7d04d31d1dd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java index 7826527918..ae9ccc09db 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java @@ -612,7 +612,7 @@ public abstract class QtLoader { } if (m_qtLibs != null) { - String libPrefix = apkDeployFromSystem ? libsDir + "lib" : localPrefix + "lib/lib"; + String libPrefix = libsDir + "lib"; for (int i = 0; i < m_qtLibs.length; i++) libraryList.add(libPrefix + m_qtLibs[i] + ".so"); } |