projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into easysetup
[platform/upstream/iotivity.git]
/
service
/
SConscript
diff --git
a/service/SConscript
b/service/SConscript
old mode 100644
(file)
new mode 100755
(executable)
index
363f26e
..
50fd899
--- a/
service/SConscript
+++ b/
service/SConscript
@@
-49,7
+49,6
@@
if target_os not in ['arduino','darwin', 'ios']:
SConscript('resource-directory/SConscript')
# Build EasySetup module
-if target_os in ['arduino',
'android', 'linux
']:
+if target_os in ['arduino',
'android', 'linux','tizen
']:
SConscript('easy-setup/SConscript')
-