Merge branch 'master' into notification-service

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

diff --git a/service/SConscript b/service/SConscript
index 114be6e..e774d74 100755 (executable)
--- a/service/SConscript
+++ b/service/SConscript
@@ -30,7 +30,7 @@ if target_os not in ['arduino','darwin', 'ios', 'windows']:
     # Build things manager project
     SConscript('things-manager/SConscript')
 
-    # Build notification manager project
+    # Build resource-hosting project
     SConscript('resource-hosting/SConscript')
 
     # Build resource-encapsulation project
@@ -43,6 +43,10 @@ if target_os not in ['arduino','darwin', 'ios', 'windows']:
     if target_os in ['linux']:
         SConscript('scene-manager/SConscript')
 
+    # Build notification-service project    
+    #if target_os in ['linux','android']:
+       # SConscript('notification/SConscript')
+
     # Build simulator module
     if target_os in ['linux'] and env.get('SIMULATOR', False):
         SConscript('simulator/SConscript')