mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-20 01:14:20 +00:00
Code Activity

Fixed a bug that would cause asserts to be ignored on some android platforms

Browse source
This commit is contained in:
hogliux 2017-02-09 17:42:44 +00:00
parent 84da06214d
commit 376b83986a
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/juce_core/native/juce_android_Threads.cpp
View file

@ -66,6 +66,13 @@ JUCE_API void JUCE_CALLTYPE Process::setPriority (ProcessPriority prior)
JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger() noexcept
{
StringArray lines;
File ("/proc/self/status").readLines (lines);
for (int i = lines.size(); --i >= 0;) // (NB - it's important that this runs in reverse order)
if (lines[i].upToFirstOccurrenceOf (":", false, false).trim().equalsIgnoreCase ("TracerPid"))
return (lines[i].fromFirstOccurrenceOf (":", false, false).trim().getIntValue() > 0);
return false;
}

4
modules/juce_core/system/juce_PlatformDefs.h
View file

@ -62,7 +62,7 @@
#endif
//==============================================================================
#if JUCE_IOS || JUCE_LINUX || JUCE_ANDROID
#if JUCE_IOS || JUCE_LINUX
/** This will try to break into the debugger if the app is currently being debugged.
If called by an app that's not being debugged, the behaviour isn't defined - it may
crash or not, depending on the platform.
@ -80,6 +80,8 @@
#else
#define JUCE_BREAK_IN_DEBUGGER { asm ("int $3"); }
#endif
#elif JUCE_ANDROID
#define JUCE_BREAK_IN_DEBUGGER { __builtin_trap(); }
#else
#define JUCE_BREAK_IN_DEBUGGER { __asm int 3 }
#endif