From: G S Senthil Kumar Date: Tue, 1 Sep 2015 06:46:09 +0000 (+0530) Subject: Merge branch 'master' into simulator X-Git-Tag: 1.2.0+RC1~764^2~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f156a5121851f45a6f803be854197d5d3c6184e2;p=platform%2Fupstream%2Fiotivity.git Merge branch 'master' into simulator Change-Id: I991a4d46eaa2cf073cdad357bc11b373971837be Signed-off-by: G S Senthil Kumar --- f156a5121851f45a6f803be854197d5d3c6184e2 diff --cc service/SConscript index 8bddead,75270d7..d6d8a5b --- a/service/SConscript +++ b/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')