From 9df33bae661ea0619acd6eaea58b81963aa3ffa0 Mon Sep 17 00:00:00 2001 From: tomikun <60690056+alexytomi@users.noreply.github.com> Date: Thu, 16 Apr 2026 00:11:38 +0800 Subject: [PATCH] [FIXME]regression: Execute .jar non-functional (#239) #238 pushed the wrong commit..oops --- .../java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java | 5 ----- .../src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java index bac0b3d3c..d96967a91 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java @@ -357,11 +357,6 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc JREUtils.redirectAndPrintJRELog(); try { List javaArgList = new ArrayList<>(); - // FIXME: Freetype is shipped inside lwjgl. We should ship it outside and use lwjgl native jars instead. - String javaLibraryPath = Tools.lwjglNativesDir + ":" + - Tools.NATIVE_LIB_DIR; - javaArgList.add("-Djava.library.path="+ javaLibraryPath); - // Enable Caciocavallo Tools.getCacioJavaArgs(javaArgList,runtime.javaVersion == 8, this); if(javaArgs != null) { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java index db699eccd..ae950c7db 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java @@ -1,6 +1,8 @@ package net.kdt.pojavlaunch.utils; import static net.kdt.pojavlaunch.Architecture.ARCH_X86; +import static net.kdt.pojavlaunch.Architecture.archAsStringAndroid; +import static net.kdt.pojavlaunch.Architecture.getDeviceArchitecture; import static net.kdt.pojavlaunch.Architecture.is64BitsDevice; import static net.kdt.pojavlaunch.Tools.LOCAL_RENDERER; import static net.kdt.pojavlaunch.Tools.NATIVE_LIB_DIR; @@ -167,6 +169,8 @@ public class JREUtils { .append("/vendor/").append(libName).append(":") .append("/vendor/").append(libName).append("/hw:") .append(NATIVE_LIB_DIR); + // FIXME: Freetype is shipped inside lwjgl. We should ship it outside and use lwjgl native jars instead. + ldLibraryPath.append(String.format(":%s/lwjgl-3.3.3-natives/%s", Tools.DIR_DATA, archAsStringAndroid(getDeviceArchitecture()))); LD_LIBRARY_PATH = ldLibraryPath.toString(); }