replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / SConscript

diff --git a/service/easy-setup/mediator/richsdk/SConscript b/service/easy-setup/mediator/richsdk/SConscript
old mode 100644 (file)
new mode 100755 (executable)
index b428dde..eaf5422
--- a/service/easy-setup/mediator/richsdk/SConscript
+++ b/service/easy-setup/mediator/richsdk/SConscript
@@ -81,16 +81,15 @@ if target_os in ['linux', 'tizen']:
        easy_setup_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
        easy_setup_env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
        easy_setup_env.AppendUnique(CXXFLAGS = ['-pthread'])
-       easy_setup_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger'])
+       easy_setup_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction'])
        if env.get('SECURED') == '1':
                easy_setup_env.AppendUnique(LIBS = ['ocpmapi', 'ocprovision'])
 
-if target_os in ['android','ios','linux','tizen']:
+if target_os in ['android','linux','ios','tizen']:
        easy_setup_env.PrependUnique(CPPPATH = [
                env.get('SRC_DIR') + '/resource/c_common/oic_malloc/include',
                env.get('SRC_DIR') + '/resource/include',
                env.get('SRC_DIR') + '/resource/csdk/logger/include',
-               env.get('SRC_DIR') + '/resource/csdk/include',
                env.get('SRC_DIR') + '/resource/csdk/stack/include',
                env.get('SRC_DIR') + '/resource/csdk/logger/include',
                env.get('SRC_DIR') + '/resource/csdk/security/include',
@@ -162,17 +161,19 @@ if target_os in ['android']:
 ######################################################################
 # Build RichSDK Mediator Sample App
 ################################################ ######################
-if target_os in ['linux']:
-       SConscript('../../sampleapp/mediator/linux/richsdk_sample/SConscript')
+#if target_os in ['linux']:
+#    SConscript('../../sampleapp/mediator/linux/richsdk_sample/SConscript')
+#      SConscript('../../sampleapp/mediator/linux-samsung/richsdk_sample/SConscript')
 
-if target_os in ['android']:
-       SConscript('../../sampleapp/mediator/android/SConscript')
+#if target_os in ['android']:
+#      SConscript('../../sampleapp/mediator/android/SConscript')
+#      SConscript('../../sampleapp/mediator/android-samsung/SConscript')
 
 
 ######################################################################
 #Build UnitTestcases for Mediator[RichSDK]
 ################################################ ######################
-if env.get('SECURED') == '0':
-   if target_os == 'linux':
-       SConscript('unittests/SConscript')
+#if env.get('SECURED') == '0':
+#   if target_os == 'linux':
+#       SConscript('unittests/SConscript')