Android: use the correct ABI folder to load uncompressed libs
It's possible that the first ABI from Build.SUPPORTED_ABIS would return an ABI that's not packaged in the APK, for example if an armeabi-v7a APK is run under the device supporting arm64-v8a, in that case the returned path would be that of an arm64-v8a while it's not actually packaged inside the APK. Fixes: QTBUG-132155 Pick-to: 6.9 Change-Id: I0f311accee246fa2d1d0b8aaf424d034b4b2d04c Reviewed-by: André Klitzing <aklitzing@gmail.com> Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
This commit is contained in:
parent
fd6f593c7f
commit
a5f80b4732
@ -375,7 +375,12 @@ abstract class QtLoader {
|
|||||||
**/
|
**/
|
||||||
private String getApkNativeLibrariesDir()
|
private String getApkNativeLibrariesDir()
|
||||||
{
|
{
|
||||||
return QtApkFileEngine.getAppApkFilePath() + "!/lib/" + Build.SUPPORTED_ABIS[0] + "/";
|
if (m_preferredAbi == null) {
|
||||||
|
// Workaround: getLocalLibrariesList() will call preferredAbiLibs()
|
||||||
|
// with valid library names which will assign m_preferredAbi.
|
||||||
|
getLocalLibrariesList();
|
||||||
|
}
|
||||||
|
return QtApkFileEngine.getAppApkFilePath() + "!/lib/" + m_preferredAbi + "/";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user