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

Replace execute binary with 'JNI_CreateJavaVM'

Browse Source
This commit is contained in:
khanhduytran0
2020-08-28 14:45:43 +07:00
parent 4918d8d8c4
commit c55cddf6f1
8 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/oracle/dalvik/VMLauncher.java
View File

@@ -4,4 +4,6 @@ public final class VMLauncher {
private VMLauncher() {
}
public static native int launchJVM(String[] args);
public static native int createLaunchMainJVM(String[] vmArgs, String mainClass, String[] mainArgs);
}

23
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@@ -124,8 +124,8 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
private static final int LTYPE_PROCESS = 0;
private static final int LTYPE_INVOCATION = 1;
private static final int LTYPE_BINARYEXEC = 2;
private final int LAUNCH_TYPE = LTYPE_INVOCATION;
private static final int LTYPE_CREATEJAVAVM = 2;
private final int LAUNCH_TYPE = LTYPE_CREATEJAVAVM;
// LTYPE_INVOCATION;
// private static Collection<? extends Provider.Service> rsaPkcs1List;
@@ -1053,11 +1053,16 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
javaArgList.add("-Dminecraft.launcher.version=" + getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
}
javaArgList.add("-cp");
javaArgList.add(Tools.generateLaunchClassPath(mProfile.getVersion()));
javaArgList.add(mVersionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs));
String launchClassPath = Tools.generateLaunchClassPath(mProfile.getVersion());
if (LAUNCH_TYPE == LTYPE_CREATEJAVAVM) {
javaArgList.add("-Djava.library.path=" + launchClassPath);
} else {
javaArgList.add("-cp");
javaArgList.add(launchClassPath);
javaArgList.add(mVersionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs));
}
if (LAUNCH_TYPE == LTYPE_PROCESS) {
mLaunchShell = new ShellProcessOperation(new ShellProcessOperation.OnPrintListener(){
@@ -1128,8 +1133,8 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
startStrace(android.os.Process.myTid());
}
if (LAUNCH_TYPE == LTYPE_BINARYEXEC) {
BinaryExecutor.executeBinary(javaArgList.toArray(new String[0]));
if (LAUNCH_TYPE == LTYPE_CREATEJAVAVM) {
VMLauncher.createLaunchMainJVM(javaArgList.toArray(new String[0]), mVersionInfo.mainClass, launchArgs);
} else {
// Test
/*