Merge branch 'master' into simulator

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

diff --git a/service/SConscript b/service/SConscript
index 656a198..d6d8a5b 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -39,10 +39,16 @@ if target_os not in ['arduino','darwin','ios']:
                SConscript('protocol-plugin/SConscript')
 
        # Build notification manager project
-       SConscript('notification-manager/SConscript')
+       if target_os not in ['android', 'tizen']:
+               SConscript('notification-manager/SConscript')
 
-       # Build resource-manipulation project
-       #SConscript('resource-manipulation/SConscript')
+       # Build resource-encapsulation project
+       SConscript('resource-encapsulation/SConscript')
+
+       # Build simulator module
+       if target_os in ['linux']:
+               SConscript('simulator/SConscript')
 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')
 
+