Merge branch 'master' into simulator 30/2330/1
authorG S Senthil Kumar <senthil.gs@samsung.com>
Tue, 1 Sep 2015 06:46:09 +0000 (12:16 +0530)
committerG S Senthil Kumar <senthil.gs@samsung.com>
Tue, 1 Sep 2015 06:46:09 +0000 (12:16 +0530)
Change-Id: I991a4d46eaa2cf073cdad357bc11b373971837be
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
1  2 
service/SConscript

@@@ -43,12 -43,7 +43,11 @@@ if target_os not in ['arduino','darwin'
                SConscript('notification-manager/SConscript')
  
        # Build resource-encapsulation project
-       if target_os not in ['android', 'tizen']:
-               SConscript('resource-encapsulation/SConscript')
+       SConscript('resource-encapsulation/SConscript')
 +
 +      # Build simulator module
 +      if target_os in ['linux']:
 +              SConscript('simulator/SConscript')
  #else:
  #     SConscript('notification-manager/SampleApp/arduino/SConscript')