Replace glib threadpool usage with a 'dumb' thread implementation.

[platform/upstream/iotivity.git] / resource / csdk / connectivity / common / SConscript

diff --git a/resource/csdk/connectivity/common/SConscript b/resource/csdk/connectivity/common/SConscript
index f082dd8..7c6c558 100644 (file)
--- a/resource/csdk/connectivity/common/SConscript
+++ b/resource/csdk/connectivity/common/SConscript
@@ -13,19 +13,10 @@ root_dir = './../'
 
 ca_common_path = root_dir + 'common/'
 ca_common_src_path = ca_common_path + 'src/'
-no_glib = 'darwin,ios'
 
 env.AppendUnique(CPPPATH = [
        'common/inc/',
        ])
-       
-if ca_os == 'android':
-       main_dir  = Dir('.').srcnode().abspath
-       glib_dir = main_dir + '/../../../../extlibs/glib/glib-2.40.2/'
-       env.AppendUnique(CPPPATH = [
-                                       glib_dir,
-                                       glib_dir + 'glib',
-                                       glib_dir + 'gthread'])
 
 temp = env['CPPPATH']
 header = ' '
@@ -47,25 +38,23 @@ if ca_os == 'arduino':
        platform_src = [
                env.get('BUILD_DIR') + 'logger.c.o',
        ]
-else:
-       if ca_os in no_glib:
-               platform_src = [
-                                       ca_common_src_path + 'logger.c',
-                                       ca_common_src_path + 'oic_logger.c',
-                                       ca_common_src_path + 'oic_console_logger.c',
-                                       ca_common_src_path + 'uthreadpool.c',
-                                       ca_common_src_path + 'camutex_pthread.c'
-               ]
-       else:
-               platform_src = [
+elif env['POSIX_SUPPORTED']:
+       platform_src = [
                                        ca_common_src_path + 'logger.c',
                                        ca_common_src_path + 'oic_logger.c',
                                        ca_common_src_path + 'oic_console_logger.c',
-                                       ca_common_src_path + 'uthreadpool.c',
-                                       ca_common_src_path + 'camutex_glib.c'
+                                       ca_common_src_path + 'cathreadpool_pthreads.c',
+                                       ca_common_src_path + 'camutex_pthreads.c'
+       ]
+else:
+       platform_src = [
+               ca_common_src_path + 'logger.c',
+               ca_common_src_path + 'oic_logger.c',
+               ca_common_src_path + 'oic_console_logger.c'
                ]
 
 
+
 env.AppendUnique(CA_SRC = ca_common_src)
 env.AppendUnique(CA_SRC = platform_src)