summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
index 3724fa28bc..81304e23f6 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
@@ -259,8 +259,13 @@ public abstract class QtLoader {
boolean apkDeployFromSystem = false;
String apkPath = m_context.getApplicationInfo().publicSourceDir;
File apkFile = new File(apkPath);
- if (apkFile.exists() && Arrays.asList(SYSTEM_APP_PATHS).contains(apkFile.getParentFile().getAbsolutePath() + "/"))
- apkDeployFromSystem = true;
+ if (apkFile.exists()) {
+ for (String systemAppPath : SYSTEM_APP_PATHS) {
+ apkDeployFromSystem = apkFile.getAbsolutePath().startsWith(systemAppPath);
+ if (apkDeployFromSystem)
+ break;
+ }
+ }
String libsDir = null;
String bundledLibsDir = null;