From 9bb24615ad8644cfb7879ed42ee36b4497541805 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 11 Jan 2016 14:53:48 +0200 Subject: 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//. Using nativeLibraryDir instead of dataDir we'll get the right folder. Change-Id: I40ef9513eb5b51f81032bd41f9943ab7b959ad51 Task-number: QTBUG-50394 Reviewed-by: Christian Stromme --- .../java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/android') 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 libs = new ArrayList(); - 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); } -- cgit v1.2.3