mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-19 09:07:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

[FIXME]regression: Execute .jar non-functional (#239)

Browse Source 
#238 pushed the wrong commit..oops
This commit is contained in:
tomikun
2026-04-16 00:11:38 +08:00
committed by GitHub
parent f2542c059e
commit 9df33bae66
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
View File

@@ -357,11 +357,6 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc
JREUtils.redirectAndPrintJRELog();
try {
List<String> 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) {

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@@ -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();
}