Merge branch 'master' into simulator
[iotivity.git] / service / SConscript
index 2f5c529..8bddead 100644 (file)
@@ -39,11 +39,17 @@ 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-encapsulation project
+       if target_os not in ['android', 'tizen']:
+               SConscript('resource-encapsulation/SConscript')
+
+       # Build simulator module
+       if target_os in ['linux']:
+               SConscript('simulator/SConscript')
 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')
 
-if target_os in ['linux']:
-    # Build simulator module
-    SConscript('simulator/SConscript')