Merge branch 'master' into security-summit

[platform/upstream/iotivity.git] / service / SConscript

diff --git a/service/SConscript b/service/SConscript
index 1ada260..eadf4be 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -26,21 +26,24 @@ Import('env')
 
 target_os = env.get('TARGET_OS')
 
-if target_os not in ['arduino','darwin']:
+if target_os not in ['arduino','darwin','ios']:
        # Build things manager project
-       if target_os != 'android':      
-               SConscript('things-manager/SConscript')
+       SConscript('things-manager/SConscript')
 
        # Build soft sensor manager project
        SConscript('soft-sensor-manager/SConscript')
 
        # Build protocol plugin project
        # protocol-plugin use 'inotify', this feature isn't support by MAC OSX
-       if target_os not in ['darwin', 'ios', 'android']:
+       if target_os not in ['darwin', 'ios']:
                SConscript('protocol-plugin/SConscript')
 
        # Build notification manager project
-       SConscript('notification-manager/SConscript')
+       if target_os not in ['android']:
+               SConscript('notification-manager/SConscript')
+
+       # Build resource-encapsulation project
+       SConscript('resource-encapsulation/SConscript')
 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')