mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use static initialization for Android class loader

This commit is contained in:
ζeh Matt 2023-06-27 23:09:53 +03:00
parent 60a2d5c1f6
commit 484523f82f
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/platform/Platform.Android.cpp
View File

@ -27,7 +27,7 @@ AndroidClassLoader::~AndroidClassLoader()
jobject AndroidClassLoader::_classLoader;
jmethodID AndroidClassLoader::_findClassMethod;
static std::shared_ptr<AndroidClassLoader> acl;
static std::shared_ptr<AndroidClassLoader> acl = std::make_shared<AndroidClassLoader>();
namespace Platform
{
@ -173,11 +173,6 @@ namespace Platform
return displayScale;
}
void AndroidInitClassLoader()
{
acl = std::make_shared<AndroidClassLoader>();
}
jclass AndroidFindClass(JNIEnv* env, std::string_view name)
{
return static_cast<jclass>(env->CallObjectMethod(

9
src/openrct2/platform/Platform.Common.cpp
View File

@ -39,15 +39,6 @@ namespace Platform
{
void CoreInit()
{
static bool initialised = false;
if (!initialised)
{
initialised = true;
#ifdef __ANDROID__
Platform::AndroidInitClassLoader();
#endif // __ANDROID__
}
}
CurrencyType GetCurrencyValue(const char* currCode)

1
src/openrct2/platform/Platform.h
View File

@ -103,7 +103,6 @@ namespace Platform
bool SetupUriProtocol();
#endif
#ifdef __ANDROID__
void AndroidInitClassLoader();
jclass AndroidFindClass(JNIEnv* env, std::string_view name);
#endif