3 files changed, 11 insertions, 2 deletions
diff --git a/emulator/opengl/shared/OpenglOsUtils/Android.mk b/emulator/opengl/shared/OpenglOsUtils/Android.mk
index 8a6c18b..d8807d0 100644
--- a/emulator/opengl/shared/OpenglOsUtils/Android.mk
+++ b/emulator/opengl/shared/OpenglOsUtils/Android.mk
@@ -10,6 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 host_common_SRC_FILES := osDynLibrary.cpp
 host_common_LDLIBS :=
+host_common_INCLUDES := $(LOCAL_PATH)
 
 ifeq ($(HOST_OS),windows)
     host_common_SRC_FILES += \
@@ -29,15 +30,17 @@ endif
 
 ### 32-bit host library ####
 $(call emugl-begin-host-static-library,libOpenglOsUtils)
-    $(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
+    $(call emugl-export,C_INCLUDES,$(host_common_INCLUDES))
     LOCAL_SRC_FILES = $(host_common_SRC_FILES)
     $(call emugl-export,LDLIBS,$(host_common_LDLIBS))
+    $(call emugl-import,libemugl_common)
 $(call emugl-end-module)
 
 ### 64-bit host library ####
 $(call emugl-begin-host-static-library,lib64OpenglOsUtils)
-    $(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
+    $(call emugl-export,C_INCLUDES,$(host_common_INCLUDES))
     LOCAL_SRC_FILES = $(host_common_SRC_FILES)
     $(call emugl-export,LDLIBS,$(host_common_LDLIBS))
     $(call emugl-export,CFLAGS,-m64)
+    $(call emugl-import,lib64emugl_common)
 $(call emugl-end-module)
diff --git a/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp b/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp
index 8cd73a9..ef2bebc 100644
--- a/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp
+++ b/emulator/opengl/shared/OpenglOsUtils/osThreadUnix.cpp
@@ -15,6 +15,8 @@
 */
 #include "osThread.h"
 
+#include "emugl/common/thread_store.h"
+
 #include <stdint.h>
 
 namespace osUtils {
@@ -88,6 +90,7 @@ Thread::thread_main(void *p_arg)
     self->m_exitStatus = ret;
     pthread_mutex_unlock(&self->m_lock);
 
+    ::emugl::ThreadStore::OnThreadExit();
     return (void*)(uintptr_t)ret;
 }
 
diff --git a/emulator/opengl/shared/OpenglOsUtils/osThreadWin.cpp b/emulator/opengl/shared/OpenglOsUtils/osThreadWin.cpp
index 2d563f8..1a30b97 100644
--- a/emulator/opengl/shared/OpenglOsUtils/osThreadWin.cpp
+++ b/emulator/opengl/shared/OpenglOsUtils/osThreadWin.cpp
@@ -15,6 +15,8 @@
 */
 #include "osThread.h"
 
+#include "emugl/common/thread_store.h"
+
 namespace osUtils {
 
 Thread::Thread() :
@@ -95,6 +97,7 @@ Thread::thread_main(void *p_arg)
     Thread *self = (Thread *)p_arg;
     int ret = self->Main();
     self->m_isRunning = false;
+    ::emugl::ThreadStore::OnThreadExit();
     return ret;
 }