Update FCLauncher.java

FCL-Team · Aug 16, 2024 · afda196 · afda196
1 parent b1d52dd
commit afda196
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java b/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java
@@ -114,8 +114,27 @@ private static String getLibraryPath(Context context, String javaPath) throws IO
                 "/hw" +
                 split +
 
-                nativeDir +
-                (FFmpegPlugin.isAvailable ? split + FFmpegPlugin.libraryPath : "");
+                nativeDir;
+    }
+
+    private static String getLibraryPath(Context context) {
+        String nativeDir = context.getApplicationInfo().nativeLibraryDir;
+        String libDirName = is64BitsDevice() ? "lib64" : "lib";
+        String split = ":";
+        return  "/system/" +
+                libDirName +
+                split +
+
+                "/vendor/" +
+                libDirName +
+                split +
+
+                "/vendor/" +
+                libDirName +
+                "/hw" +
+                split +
+
+                nativeDir;
     }
 
     private static String[] rebaseArgs(FCLConfig config) throws IOException {
@@ -135,10 +154,11 @@ private static void addCommonEnv(FCLConfig config, HashMap<String, String> envMa
         envMap.put("FCL_NATIVEDIR", config.getContext().getApplicationInfo().nativeLibraryDir);
         envMap.put("TMPDIR", config.getContext().getCacheDir().getAbsolutePath());
         envMap.put("PATH", config.getJavaPath() + "/bin:" + Os.getenv("PATH"));
+        envMap.put("LD_LIBRARY_PATH", getLibraryPath(config.getContext()));
         FFmpegPlugin.discover(config.getContext());
         if (FFmpegPlugin.isAvailable) {
             envMap.put("PATH", FFmpegPlugin.libraryPath + ":" + envMap.get("PATH"));
-            envMap.put("LD_LIBRARY_PATH", FFmpegPlugin.libraryPath);
+            envMap.put("LD_LIBRARY_PATH", FFmpegPlugin.libraryPath + ":" + envMap.get("LD_LIBRARY_PATH"));
         }
         if (config.isUseVKDriverSystem()) {
             envMap.put("VULKAN_DRIVER_SYSTEM", "1");