mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-13 23:00:45 -04:00
Merge branch 'v3_openjdk' of https://github.com/PojavLauncherTeam/PojavLauncher into v3_openjdk
This commit is contained in:
commit
97d95d9ef4
@ -449,8 +449,8 @@ public class PojavLoginActivity extends BaseActivity {
|
||||
} catch (IOException e) {
|
||||
Log.e("JREAuto", "JRE was not included on this APK.", e);
|
||||
}
|
||||
if(current_rt_version == null && otherRuntimesAvailable) return true; //Assume user maintains his own runtime
|
||||
if(rt_version == null) return false;
|
||||
if(current_rt_version == null && MultiRTUtils.getExactJreName(8) != null) return true; //Assume user maintains his own runtime
|
||||
if(rt_version == null) return otherRuntimesAvailable; // On noruntime builds, skip if there is at least 1 runtime installed (no matter if it is 8 or not)
|
||||
if(!rt_version.equals(current_rt_version)) { //If we already have an integrated one installed, check if it's up-to-date
|
||||
try {
|
||||
MultiRTUtils.installRuntimeNamedBinpack(getApplicationInfo().nativeLibraryDir, am.open("components/jre/universal.tar.xz"), am.open("components/jre/bin-" + archAsString(Tools.DEVICE_ARCHITECTURE) + ".tar.xz"), "Internal", rt_version,
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2
gl4es
2
gl4es
@ -1 +1 @@
|
||||
Subproject commit 0b88353ac940b99d2624007ddb18083b0204fcae
|
||||
Subproject commit 688400f46edf04b863cdb6d148bcb11dc8bc21c0
|
Loading…
x
Reference in New Issue
Block a user