1 files changed, 12 insertions, 3 deletions

diff --git a/firmware/thread.c b/firmware/thread.c
index c00fc36e3f..b3d8ec3970 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
@@ -123,8 +123,13 @@ static struct core_entry cores[NUM_CORES] IBSS_ATTR;
 struct thread_entry threads[MAXTHREADS] IBSS_ATTR;
 
 static const char main_thread_name[] = "main";
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 extern uintptr_t stackbegin[];
 extern uintptr_t stackend[];
+#else
+extern uintptr_t *stackbegin;
+extern uintptr_t *stackend;
+#endif
 
 static inline void core_sleep(IF_COP_VOID(unsigned int core))
         __attribute__((always_inline));
@@ -170,7 +175,9 @@ void switch_thread(void)
 /****************************************************************************
  * Processor-specific section - include necessary core support
  */
-#if defined(CPU_ARM)
+#if defined(ANDROID)
+#include "thread-android-arm.c"
+#elif defined(CPU_ARM)
 #include "thread-arm.c"
 #if defined (CPU_PP)
 #include "thread-pp.c"
@@ -1150,7 +1157,7 @@ void switch_thread(void)
     store_context(&thread->context);
 
     /* Check if the current thread stack is overflown */
-    if (UNLIKELY(thread->stack[0] != DEADBEEF))
+    if (UNLIKELY(thread->stack[0] != DEADBEEF) && thread->stack_size > 0)
         thread_stkov(thread);
 
 #if NUM_CORES > 1
@@ -2319,7 +2326,9 @@ static int stack_usage(uintptr_t *stackptr, size_t stack_size)
  */
 int thread_stack_usage(const struct thread_entry *thread)
 {
-    return stack_usage(thread->stack, thread->stack_size);
+    if (LIKELY(thread->stack_size > 0))
+        return stack_usage(thread->stack, thread->stack_size);
+    return 0;
 }
 
 #if NUM_CORES > 1