diff options
author | BogDan Vatra <bogdan@kdab.com> | 2016-01-11 14:53:48 +0200 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2016-01-16 08:52:56 +0000 |
commit | 9bb24615ad8644cfb7879ed42ee36b4497541805 (patch) | |
tree | e5087d9b7cf1e6029a93222a5d5d797f4903f462 /src/android/java | |
parent | c26562033b7b71e26527ec013f3750d07ec6100a (diff) |
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>
Diffstat (limited to 'src/android/java')
-rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java index 146d6b34f2..f370b4f667 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -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); } |