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

Update jre_launcher.c

Browse Source
This commit is contained in:
Duy Tran Khanh 2021-11-09 07:12:50 +07:00 committed by GitHub
parent cdfd769f91
commit 29cfec1e26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app_pojavlauncher/src/main/jni/jre_launcher.c
View File

@ -83,6 +83,15 @@ typedef jint JLI_Launch_func(int argc, char ** argv, /* main argc, argc */
jint ergo /* ergonomics class policy */ jint ergo /* ergonomics class policy */
); );
void* (*old_dlopen)(const char *filename, int flags);
void* custom_dlopen(const char *filename, int flags) {
if (flags == (RTLD_LAZY | RTLD_LOCAL)) {
return old_dlopen(filename, RTLD_LAZY | RTLD_GLOBAL);
} else {
return old_dlopen(filename, flags);
}
}
static jint launchJVM(int margc, char** margv) { static jint launchJVM(int margc, char** margv) {
void* libjli = dlopen("libjli.so", RTLD_LAZY | RTLD_GLOBAL); void* libjli = dlopen("libjli.so", RTLD_LAZY | RTLD_GLOBAL);
@ -159,6 +168,13 @@ JNIEXPORT jint JNICALL Java_com_oracle_dalvik_VMLauncher_launchJVM(JNIEnv *env,
CATCHSIG(SIGXFSZ); CATCHSIG(SIGXFSZ);
//Signal trapper ready //Signal trapper ready
// Since we have moved from JNI call to LWJGL call for fixing GL context
// set incorrectly, we're facing another problem: fields in the previously
// loaded pojavexec aren't shared to LWJGL loaded one, is it because
// of RTLD_LOCAL? hook moment.
xhook_register(".*/liblwjgl.so$","dlopen",custom_dlopen,&old_dlopen);
xhook_refresh(1);
// Save dalvik JNIEnv pointer for JVM launch thread // Save dalvik JNIEnv pointer for JVM launch thread
dalvikJNIEnvPtr_ANDROID = env; dalvikJNIEnvPtr_ANDROID = env;