TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 00:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert b7b2c4868c4701255ed306ef8d8e33b18bf5272d

Browse Source
This commit is contained in:
Duy Tran Khanh 2021-06-25 06:32:54 +07:00 committed by GitHub
parent 34db2a688f
commit 4d812cc49a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@ -69,8 +69,6 @@ public class JREUtils
} }
public static void initJavaRuntime() { public static void initJavaRuntime() {
dlopen(findInLdLibPath("libjli.so")); dlopen(findInLdLibPath("libjli.so"));
File serverFile = new File(Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/server/libjvm.so");
dlopen(Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/" + (serverFile.exists() ? "server" : "client") + "/libjvm.so");
dlopen(findInLdLibPath("libjvm.so")); dlopen(findInLdLibPath("libjvm.so"));
dlopen(findInLdLibPath("libverify.so")); dlopen(findInLdLibPath("libverify.so"));
dlopen(findInLdLibPath("libjava.so")); dlopen(findInLdLibPath("libjava.so"));
@ -188,8 +186,8 @@ public class JREUtils
StringBuilder ldLibraryPath = new StringBuilder(); StringBuilder ldLibraryPath = new StringBuilder();
File serverFile = new File(Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/server/libjvm.so"); File serverFile = new File(Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/server/libjvm.so");
// To make libjli.so ignore re-execute // To make libjli.so ignore re-execute
/*ldLibraryPath.append( ldLibraryPath.append(
Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/" + (serverFile.exists() ? "server" : "client") + ":");*/ Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/" + (serverFile.exists() ? "server" : "client") + ":");
ldLibraryPath.append( ldLibraryPath.append(
Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/jli:" + Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/jli:" +
Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + ":" Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + ":"