ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Attach CPU thread to JVM early

This commit is contained in:
JosJuice 2020-09-14 17:58:33 +02:00
parent 3a0917371e
commit e86d713600
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/CMakeLists.txt
View File

@ -583,6 +583,11 @@ if (APPLE)
${IOB_LIBRARY} ${IOB_LIBRARY}
${IOK_LIBRARY} ${IOK_LIBRARY}
) )
elseif (ANDROID)
target_link_libraries(core
PRIVATE
androidcommon
)
endif() endif()
if(LIBUSB_FOUND) if(LIBUSB_FOUND)

10
Source/Core/Core/Core.cpp
View File

@ -85,6 +85,10 @@
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
#ifdef ANDROID
#include "jni/AndroidCommon/IDCache.h"
#endif
namespace Core namespace Core
{ {
static bool s_wants_determinism; static bool s_wants_determinism;
@ -335,6 +339,12 @@ static void CpuThread(const std::optional<std::string>& savestate_path, bool del
// This needs to be delayed until after the video backend is ready. // This needs to be delayed until after the video backend is ready.
DolphinAnalytics::Instance().ReportGameStart(); DolphinAnalytics::Instance().ReportGameStart();
#ifdef ANDROID
// For some reason, calling the JNI function AttachCurrentThread from the CPU thread after a
// certain point causes a crash if fastmem is enabled. Let's call it early to avoid that problem.
static_cast<void>(IDCache::GetEnvForThread());
#endif
if (_CoreParameter.bFastmem) if (_CoreParameter.bFastmem)
EMM::InstallExceptionHandler(); // Let's run under memory watch EMM::InstallExceptionHandler(); // Let's run under memory watch