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

Fix crash

Browse Source
This commit is contained in:
khanhduytran0 2020-10-16 12:36:15 +07:00
parent ec6a13ca39
commit 4c61db11ac
1 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,24 +14,34 @@ import org.lwjgl.glfw.*;
public class JREUtils public class JREUtils
{ {
private JREUtils() {} private JREUtils() {}
private static String nativeLibDir; private static String nativeLibDir;
public static void initJavaRuntime() { private static String findInLdLibPath(String libName) {
dlopen("libjli.so"); for (String libPath : Os.getenv("LD_LIBRARY_PATH").split(":")) {
File f = new File(libPath, libName);
if (f.exists() && f.isFile()) {
return f.getAbsolutePath();
}
}
return libName;
}
public static void initJavaRuntime() {
dlopen(findInLdLibPath("libjli.so"));
// As we set LD_LIBRARY_PATH, so it's not required to preload them // As we set LD_LIBRARY_PATH, so it's not required to preload them
/* /*
dlopen("libjvm.so"); 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");
dlopen(Tools.homeJreDir + "/lib/libnet.so"); dlopen(Tools.homeJreDir + "/lib/libnet.so");
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")) {
@ -41,8 +51,8 @@ public class JREUtils
System.err.println("Failed to load custom OpenGL library " + LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME + ". Fallbacking to GL4ES."); System.err.println("Failed to load custom OpenGL library " + LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME + ". Fallbacking to GL4ES.");
dlopen(nativeLibDir + "/libgl04es.so"); dlopen(nativeLibDir + "/libgl04es.so");
} }
} }
private static boolean checkAccessTokenLeak = true; private static boolean checkAccessTokenLeak = true;
public static void redirectAndPrintJRELog(final LoggableActivity act, final String accessToken) { public static void redirectAndPrintJRELog(final LoggableActivity act, final String accessToken) {
JREUtils.redirectLogcat(); JREUtils.redirectLogcat();
@ -91,12 +101,12 @@ public class JREUtils
} }
}); });
t.start(); t.start();
Log.i("jrelog-logcat","Logcat thread started"); Log.i("jrelog-logcat","Logcat thread started");
} }
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";
StringBuilder ldLibraryPath = new StringBuilder(); StringBuilder ldLibraryPath = new StringBuilder();
@ -106,26 +116,26 @@ public class JREUtils
ldLibraryPath.append(Tools.homeJreDir + "/lib/" + arch + ":"); ldLibraryPath.append(Tools.homeJreDir + "/lib/" + arch + ":");
} }
ldLibraryPath.append( ldLibraryPath.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/jli:" +
Tools.homeJreDir + "/lib:" + Tools.homeJreDir + "/lib:" +
"/system/" + libName + ":" + "/system/" + libName + ":" +
"/vendor/" + libName + ":" + "/vendor/" + libName + ":" +
"/vendor/" + libName + "/hw:" + "/vendor/" + libName + "/hw:" +
nativeLibDir nativeLibDir
); );
setEnvironment(launchType, "JAVA_HOME", Tools.homeJreDir); setEnvironment(launchType, "JAVA_HOME", Tools.homeJreDir);
setEnvironment(launchType, "HOME", Tools.MAIN_PATH); setEnvironment(launchType, "HOME", Tools.MAIN_PATH);
setEnvironment(launchType, "TMPDIR", ctx.getCacheDir().getAbsolutePath()); setEnvironment(launchType, "TMPDIR", ctx.getCacheDir().getAbsolutePath());
setEnvironment(launchType, "LIBGL_MIPMAP", "3"); setEnvironment(launchType, "LIBGL_MIPMAP", "3");
setEnvironment(launchType, "MESA_GLSL_CACHE_DIR", ctx.getCacheDir().getAbsolutePath()); setEnvironment(launchType, "MESA_GLSL_CACHE_DIR", ctx.getCacheDir().getAbsolutePath());
setEnvironment(launchType, "LD_LIBRARY_PATH", ldLibraryPath.toString()); setEnvironment(launchType, "LD_LIBRARY_PATH", ldLibraryPath.toString());
setEnvironment(launchType, "PATH", Tools.homeJreDir + "/bin:" + Os.getenv("PATH")); setEnvironment(launchType, "PATH", Tools.homeJreDir + "/bin:" + Os.getenv("PATH"));
setEnvironment(launchType, "REGAL_GL_VENDOR", "Android"); setEnvironment(launchType, "REGAL_GL_VENDOR", "Android");
setEnvironment(launchType, "REGAL_GL_RENDERER", "Regal"); setEnvironment(launchType, "REGAL_GL_RENDERER", "Regal");
@ -148,34 +158,33 @@ public class JREUtils
// REGAL_GL_EXTENSIONS // REGAL_GL_EXTENSIONS
setLdLibraryPath(ldLibraryPath.toString()); setLdLibraryPath(ldLibraryPath.toString());
// return ldLibraryPath; // return ldLibraryPath;
} }
private static void setEnvironment(int launchType, String name, String value) throws Throwable { private static void setEnvironment(int launchType, String name, String value) throws Throwable {
if (launchType == Tools.LTYPE_PROCESS) { if (launchType == Tools.LTYPE_PROCESS) {
Tools.mLaunchShell.writeToProcess("export " + name + "=" + value); Tools.mLaunchShell.writeToProcess("export " + name + "=" + value);
} else { }
Os.setenv(name, value, true); Os.setenv(name, value, true);
} }
}
public static native int chdir(String path); public static native int chdir(String path);
public static native boolean dlopen(String libPath); public static native boolean dlopen(String libPath);
public static native void redirectLogcat(); public static native void redirectLogcat();
public static native void setLdLibraryPath(String ldLibraryPath); public static native void setLdLibraryPath(String ldLibraryPath);
public static native void setupBridgeWindow(Object surface); public static native void setupBridgeWindow(Object surface);
// TODO AWT Android port // TODO AWT Android port
public static native void setupBridgeSurfaceAWT(long surface); public static native void setupBridgeSurfaceAWT(long surface);
// BEFORE Load and execute PIE binary using dlopen and dlsym("main") // BEFORE Load and execute PIE binary using dlopen and dlsym("main")
// AFTER: [Deprecated] // AFTER: [Deprecated]
@Deprecated @Deprecated
public static native int executeBinary(String[] args); public static native int executeBinary(String[] args);
static { static {
System.loadLibrary("pojavexec"); System.loadLibrary("pojavexec");
} }
} }