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

Some changes

Browse Source 
- Only preload libjli.so, as LD_LIBRARY_PATH is set to load libs correctly.
- Add to LD_LIBRARY_PATH paths to specific architeture like "jre_runtime/lib/[architecture]/(server/jli/.)".
This commit is contained in:
khanhduytran0 2020-10-16 12:17:30 +07:00
parent bf221a2fb9
commit 56c49f1143
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/net/kdt/pojavlaunch/JREUtils.java
View File

@ -19,8 +19,11 @@ public class JREUtils
private static String nativeLibDir; private static String nativeLibDir;
public static void initJavaRuntime() { public static void initJavaRuntime() {
dlopen(Tools.homeJreDir + "/lib/jli/libjli.so"); dlopen("libjli.so");
dlopen(Tools.homeJreDir + "/lib/server/libjvm.so");
// As we set LD_LIBRARY_PATH, so it's not required to preload them
/*
dlopen("libjvm.so");
dlopen(Tools.homeJreDir + "/lib/libverify.so"); dlopen(Tools.homeJreDir + "/lib/libverify.so");
dlopen(Tools.homeJreDir + "/lib/libjava.so"); dlopen(Tools.homeJreDir + "/lib/libjava.so");
// dlopen(Tools.homeJreDir + "/lib/libjsig.so"); // dlopen(Tools.homeJreDir + "/lib/libjsig.so");
@ -28,7 +31,7 @@ public class JREUtils
dlopen(Tools.homeJreDir + "/lib/libnio.so"); dlopen(Tools.homeJreDir + "/lib/libnio.so");
dlopen(Tools.homeJreDir + "/lib/libawt.so"); dlopen(Tools.homeJreDir + "/lib/libawt.so");
dlopen(Tools.homeJreDir + "/lib/libawt_headless.so"); dlopen(Tools.homeJreDir + "/lib/libawt_headless.so");
*/
dlopen(nativeLibDir + "/libopenal.so"); dlopen(nativeLibDir + "/libopenal.so");
if (LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME.equals("libgl04es.so")) { if (LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME.equals("libgl04es.so")) {
@ -94,18 +97,26 @@ public class JREUtils
public static void setJavaEnvironment(Context ctx, int launchType) throws Throwable { public static void setJavaEnvironment(Context ctx, int launchType) throws Throwable {
nativeLibDir = ctx.getApplicationInfo().nativeLibraryDir; nativeLibDir = ctx.getApplicationInfo().nativeLibraryDir;
String libName = System.getProperty("os.arch").contains("64") ? "lib64" : "lib"; String libName = System.getProperty("os.arch").contains("64") ? "lib64" : "lib";
String ldLibraryPath = (
StringBuilder builder = new StringBuilder();
for (String arch : Tools.currentArch.split("/")) {
builder.append(Tools.homeJreDir + "/lib/" + arch + "/server:");
builder.append(Tools.homeJreDir + "/lib/" + arch + "/jli:");
builder.append(Tools.homeJreDir + "/lib/" + arch + ":");
}
builder.append(
// To make libjli.so ignore re-execute // To make libjli.so ignore re-execute
Tools.homeJreDir + "/lib/server:" + Tools.homeJreDir + "/lib/server:" +
Tools.homeJreDir + "/lib/jli:" +
Tools.homeJreDir + "/lib:" +
"/system/" + libName + ":" + "/system/" + libName + ":" +
"/vendor/" + libName + ":" + "/vendor/" + libName + ":" +
"/vendor/" + libName + "/hw:" + "/vendor/" + libName + "/hw:" +
nativeLibDir + ":" + nativeLibDir
Tools.homeJreDir + "/lib/jli:" +
Tools.homeJreDir + "/lib"
); );
setEnvironment(launchType, "JAVA_HOME", Tools.homeJreDir); setEnvironment(launchType, "JAVA_HOME", Tools.homeJreDir);