From e6ea54740d5472014dbdc86b1625d197eb8a858c Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sun, 30 Aug 2020 05:53:54 +0700 Subject: [PATCH] Make Boardwalk2's JRE9 runtime works on this launcher --- .../main/java/net/kdt/pojavlaunch/MainActivity.java | 5 ++++- .../arm64-v8a/libbinexecutor.so | Bin .../arm64-v8a/libgl04es.so | Bin .../arm64-v8a/liblwjgl.so | Bin .../arm64-v8a/liblwjgl_opengl.so | Bin .../arm64-v8a/liblwjgl_stb.so | Bin .../x86/libbinexecutor.so | Bin .../{jniLibs => jniLibs_disabled}/x86/libgl04es.so | Bin .../{jniLibs => jniLibs_disabled}/x86/liblwjgl.so | Bin .../x86/liblwjgl_opengl.so | Bin .../x86/liblwjgl_stb.so | Bin .../{jniLibs => jniLibs_disabled}/x86/libopenal.so | Bin .../x86_64/libbinexecutor.so | Bin .../x86_64/libgl04es.so | Bin .../x86_64/liblwjgl.so | Bin .../x86_64/liblwjgl_opengl.so | Bin .../x86_64/liblwjgl_stb.so | Bin 17 files changed, 4 insertions(+), 1 deletion(-) rename app/src/main/{jniLibs => jniLibs_disabled}/arm64-v8a/libbinexecutor.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/arm64-v8a/libgl04es.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/arm64-v8a/liblwjgl.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/arm64-v8a/liblwjgl_opengl.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/arm64-v8a/liblwjgl_stb.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86/libbinexecutor.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86/libgl04es.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86/liblwjgl.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86/liblwjgl_opengl.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86/liblwjgl_stb.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86/libopenal.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86_64/libbinexecutor.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86_64/libgl04es.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86_64/liblwjgl.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86_64/liblwjgl_opengl.so (100%) rename app/src/main/{jniLibs => jniLibs_disabled}/x86_64/liblwjgl_stb.so (100%) diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 8b762e1cf..73bef549e 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -1035,6 +1035,8 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, getApplicationInfo().nativeLibraryDir ); */ + + javaArgList.add("-Djava.home=" + Tools.homeJreDir); javaArgList.add("-Dos.name=Linux"); // javaArgList.add("-Dorg.lwjgl.system.jemalloc.libname=libjemalloc.so"); @@ -1114,9 +1116,10 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, // setEnvironment("LIBGL_MIPMAP", "3"); setEnvironment("MESA_GLSL_CACHE_DIR", getCacheDir().getAbsolutePath()); setEnvironment("LD_LIBRARY_PATH", ldLibraryPath); + setEnvironment("PATH", Tools.homeJreDir + "/bin:" + Os.getenv("PATH")); // can fix java? - setEnvironment("ORIGIN", Tools.homeJreDir + "/lib"); + // setEnvironment("ORIGIN", Tools.homeJreDir + "/lib"); if (LAUNCH_TYPE == LTYPE_PROCESS) { mLaunchShell.writeToProcess("cd $HOME"); diff --git a/app/src/main/jniLibs/arm64-v8a/libbinexecutor.so b/app/src/main/jniLibs_disabled/arm64-v8a/libbinexecutor.so similarity index 100% rename from app/src/main/jniLibs/arm64-v8a/libbinexecutor.so rename to app/src/main/jniLibs_disabled/arm64-v8a/libbinexecutor.so diff --git a/app/src/main/jniLibs/arm64-v8a/libgl04es.so b/app/src/main/jniLibs_disabled/arm64-v8a/libgl04es.so similarity index 100% rename from app/src/main/jniLibs/arm64-v8a/libgl04es.so rename to app/src/main/jniLibs_disabled/arm64-v8a/libgl04es.so diff --git a/app/src/main/jniLibs/arm64-v8a/liblwjgl.so b/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl.so similarity index 100% rename from app/src/main/jniLibs/arm64-v8a/liblwjgl.so rename to app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl.so diff --git a/app/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so b/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_opengl.so similarity index 100% rename from app/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so rename to app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_opengl.so diff --git a/app/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so b/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_stb.so similarity index 100% rename from app/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so rename to app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_stb.so diff --git a/app/src/main/jniLibs/x86/libbinexecutor.so b/app/src/main/jniLibs_disabled/x86/libbinexecutor.so similarity index 100% rename from app/src/main/jniLibs/x86/libbinexecutor.so rename to app/src/main/jniLibs_disabled/x86/libbinexecutor.so diff --git a/app/src/main/jniLibs/x86/libgl04es.so b/app/src/main/jniLibs_disabled/x86/libgl04es.so similarity index 100% rename from app/src/main/jniLibs/x86/libgl04es.so rename to app/src/main/jniLibs_disabled/x86/libgl04es.so diff --git a/app/src/main/jniLibs/x86/liblwjgl.so b/app/src/main/jniLibs_disabled/x86/liblwjgl.so similarity index 100% rename from app/src/main/jniLibs/x86/liblwjgl.so rename to app/src/main/jniLibs_disabled/x86/liblwjgl.so diff --git a/app/src/main/jniLibs/x86/liblwjgl_opengl.so b/app/src/main/jniLibs_disabled/x86/liblwjgl_opengl.so similarity index 100% rename from app/src/main/jniLibs/x86/liblwjgl_opengl.so rename to app/src/main/jniLibs_disabled/x86/liblwjgl_opengl.so diff --git a/app/src/main/jniLibs/x86/liblwjgl_stb.so b/app/src/main/jniLibs_disabled/x86/liblwjgl_stb.so similarity index 100% rename from app/src/main/jniLibs/x86/liblwjgl_stb.so rename to app/src/main/jniLibs_disabled/x86/liblwjgl_stb.so diff --git a/app/src/main/jniLibs/x86/libopenal.so b/app/src/main/jniLibs_disabled/x86/libopenal.so similarity index 100% rename from app/src/main/jniLibs/x86/libopenal.so rename to app/src/main/jniLibs_disabled/x86/libopenal.so diff --git a/app/src/main/jniLibs/x86_64/libbinexecutor.so b/app/src/main/jniLibs_disabled/x86_64/libbinexecutor.so similarity index 100% rename from app/src/main/jniLibs/x86_64/libbinexecutor.so rename to app/src/main/jniLibs_disabled/x86_64/libbinexecutor.so diff --git a/app/src/main/jniLibs/x86_64/libgl04es.so b/app/src/main/jniLibs_disabled/x86_64/libgl04es.so similarity index 100% rename from app/src/main/jniLibs/x86_64/libgl04es.so rename to app/src/main/jniLibs_disabled/x86_64/libgl04es.so diff --git a/app/src/main/jniLibs/x86_64/liblwjgl.so b/app/src/main/jniLibs_disabled/x86_64/liblwjgl.so similarity index 100% rename from app/src/main/jniLibs/x86_64/liblwjgl.so rename to app/src/main/jniLibs_disabled/x86_64/liblwjgl.so diff --git a/app/src/main/jniLibs/x86_64/liblwjgl_opengl.so b/app/src/main/jniLibs_disabled/x86_64/liblwjgl_opengl.so similarity index 100% rename from app/src/main/jniLibs/x86_64/liblwjgl_opengl.so rename to app/src/main/jniLibs_disabled/x86_64/liblwjgl_opengl.so diff --git a/app/src/main/jniLibs/x86_64/liblwjgl_stb.so b/app/src/main/jniLibs_disabled/x86_64/liblwjgl_stb.so similarity index 100% rename from app/src/main/jniLibs/x86_64/liblwjgl_stb.so rename to app/src/main/jniLibs_disabled/x86_64/liblwjgl_stb.so