Cleanup Platform code #20502
Merged
Cleanup Platform code #20502
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ZehMatt
force-pushed
the
platform-cleanup
branch
from
32e7f17
to
d800929
Compare
ZehMatt
force-pushed
the
platform-cleanup
branch
from
9ae1bb7
to
ac58356
Compare
duncanspumpkin
approved these changes
Jun 28, 2023
janisozaur
added a commit
to janisozaur/OpenRCT2
that referenced
this pull request
Oct 17, 2023
OpenRCT2#20502 changed how startup is handled. This affected Android as well and changed AndroidClassLoader to be initialized statically, but this turns out to be problematic due to JVM not being fully initialized in our context by this time. To fix this, move AndroidClassLoader initialization to JNI_OnLoad call, where JVM is fully available. Additionally, guard against multiple calls to JNI_OnLoad, an issue present on Linux-like systems (including Android).
janisozaur
added a commit
to janisozaur/OpenRCT2
that referenced
this pull request
Oct 17, 2023
OpenRCT2#20502 changed how startup is handled. This affected Android as well and changed AndroidClassLoader to be initialized statically, but this turns out to be problematic due to JVM not being fully initialized in our context by this time. To fix this, move AndroidClassLoader initialization to JNI_OnLoad call, where JVM is fully available. Additionally, guard against multiple calls to JNI_OnLoad, an issue present on Linux-like systems (including Android).
janisozaur
added a commit
to janisozaur/OpenRCT2
that referenced
this pull request
Oct 17, 2023
OpenRCT2#20502 changed how startup is handled. This affected Android as well and changed AndroidClassLoader to be initialized statically, but this turns out to be problematic due to JVM not being fully initialized in our context by this time. To fix this, move AndroidClassLoader initialization to JNI_OnLoad call, where JVM is fully available. Additionally, guard against multiple calls to JNI_OnLoad, an issue present on Linux-like systems (including Android).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Time that we get rid of this old legacy code, we don't need the CoreInit thing at all and a lot of functionality can be replaced with chrono, filesystem etc.
Will have to keep the commits as small as possible as I have no proper way other than the CI to see if I break something.