From ffa6d7d0d7aa401ca46d54c960e371738e7f9084 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Thu, 5 Nov 2020 19:31:45 +0700 Subject: [PATCH] Fix ld lib path (2/2) --- app/src/main/java/net/kdt/pojavlaunch/InstallModActivity.java | 2 +- app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java | 2 +- app/src/main/java/net/kdt/pojavlaunch/Tools.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/InstallModActivity.java b/app/src/main/java/net/kdt/pojavlaunch/InstallModActivity.java index 841b64113..7d5e88d2a 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/InstallModActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/InstallModActivity.java @@ -106,7 +106,7 @@ public class InstallModActivity extends LoggableActivity { private int launchJavaRuntime(File modFile, String javaArgs) { try { - JREUtils.relocateLibPath(); + JREUtils.relocateLibPath(this); List javaArgList = new ArrayList(); javaArgList.add(Tools.homeJreDir + "/bin/java"); diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index 4fc2018ff..62e93231a 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -314,7 +314,7 @@ public class PojavLoginActivity extends AppCompatActivity setPref(PREF_IS_INSTALLED_JAVARUNTIME, true); } - JREUtils.relocateLibPath(); + JREUtils.relocateLibPath(this); File ftIn = new File(Tools.homeJreDir, Tools.homeJreLib + "/libfreetype.so.6"); File ftOut = new File(Tools.homeJreDir, Tools.homeJreLib + "/libfreetype.so"); diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index 54a739646..d5eebc3f7 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -76,7 +76,7 @@ public final class Tools public static ShellProcessOperation mLaunchShell; private static int exitCode = 0; public static void launchMinecraft(final LoggableActivity ctx, MCProfile.Builder profile, JMinecraftVersionList.Version versionInfo) throws Throwable { - JREUtils.relocateLibPath(); + JREUtils.relocateLibPath(ctx); String[] launchArgs = getMinecraftArgs(profile, versionInfo); List javaArgList = new ArrayList();