Merge branch 'master' into extended-easysetup

[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
index 8ed21ad..f7cd0d9 100644 (file)
--- a/service/easy-setup/mediator/richsdk/SConscript
+++ b/service/easy-setup/mediator/richsdk/SConscript
@@ -86,6 +86,7 @@ if target_os in ['linux']:
                easy_setup_env.AppendUnique(LIBS = ['ocpmapi', 'ocprovision'])
 
 if target_os in ['android','linux']:
+#if target_os in ['linux']:
        easy_setup_env.PrependUnique(CPPPATH = [
                env.get('SRC_DIR') + '/resource/c_common/oic_malloc/include',
                env.get('SRC_DIR') + '/resource/include',
@@ -114,11 +115,13 @@ print"easysetup_path %s" % easysetup_path
 es_src = None
 
 if target_os in ['android','linux']:
+#if target_os in ['linux']:
        if env.get('SECURED') == '1':
                env.AppendUnique(es_src = [os.path.join(easysetup_path, 'src/EnrolleeSecurity.cpp')])
 
        es_common_src = ['src/RemoteEnrollee.cpp',
-               'src/RemoteEnrolleeResource.cpp',
+               'src/EnrolleeResource.cpp',
+               'src/CloudResource.cpp',
                'src/EasySetup.cpp',
                'src/ESException.cpp']
 
@@ -138,6 +141,6 @@ if target_os == 'linux':
 ######################################################################
 #Build UnitTestcases for Mediator[RichSDK]
 ################################################ ######################
-if target_os == 'linux':
-    SConscript('unittests/SConscript')
+#if target_os == 'linux':
+#    SConscript('unittests/SConscript')