whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: fix native libs dir. 

On Andorid 64 bit O.S.s the libs are not located anymore on dataDir/lib/
but they are located on dataDir/lib/<arch>/. Using nativeLibraryDir instead
of dataDir we'll get the right folder.

Change-Id: I40ef9513eb5b51f81032bd41f9943ab7b959ad51
Task-number: QTBUG-50394
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
bb10
BogDan Vatra 2016-01-11 14:53:48 +02:00
parent c26562033b
commit 9bb24615ad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
View File

@ -454,7 +454,7 @@ public class QtActivity extends Activity
{
ArrayList<String> libs = new ArrayList<String>();
String dataDir = getApplicationInfo().dataDir + "/";
String libsDir = getApplicationInfo().nativeLibraryDir + "/";
long packageVersion = -1;
try {
@ -489,7 +489,7 @@ public class QtActivity extends Activity
for (String bundledImportBinary : list) {
String[] split = bundledImportBinary.split(":");
String sourceFileName = dataDir + "lib/" + split[0];
String sourceFileName = libsDir + split[0];
String destinationFileName = pluginsPrefix + split[1];
createBundledBinary(sourceFileName, destinationFileName);
}