Tizen build error fix with Building coap shared libraries.

Building coap and connectivity_abstraction shared libraries.
Added network.get to TMSampleApp tizen application..

Change-Id: Idf6e7121a81f92ac5a3ad7593b8bd6c692060e49
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/808
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript
index 485f161..c8143a1 100644 (file)
--- a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript
+++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript
@@ -66,5 +66,9 @@ libcoap_src = [
        'block.c'
        ]
 
-libcoap = libcoap_env.StaticLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_')
-libcoap_env.InstallTarget(libcoap, 'libcoap')
+if target_os in ['android', 'tizen'] :
+       libcoap = libcoap_env.SharedLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_')
+else :
+       libcoap = libcoap_env.StaticLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_')
+
+libcoap_env.InstallTarget([libcoap], 'libcoap')

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 04e57de..6611ada 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -102,7 +102,7 @@ if 'BLE' in ca_transport:
 
 print "Include path is %s" %env.get('CPPPATH')
 print "Files path is %s" %env.get('CA_SRC')
-if ca_os == 'android':
+if ca_os in ['android', 'tizen']:
        calib = env.SharedLibrary('connectivity_abstraction', env.get('CA_SRC'))
 else:
        calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))

diff --git a/service/things-manager/sampleapp/tizen/TMSampleApp/tizen-manifest.xml b/service/things-manager/sampleapp/tizen/TMSampleApp/tizen-manifest.xml
index 8036827..10d65fd 100644 (file)
--- a/service/things-manager/sampleapp/tizen/TMSampleApp/tizen-manifest.xml
+++ b/service/things-manager/sampleapp/tizen/TMSampleApp/tizen-manifest.xml
@@ -6,6 +6,7 @@
         <icon>tmsampleapp.png</icon>
     </ui-application>
     <privileges>
+        <privilege>http://tizen.org/privilege/network.get</privilege>
         <privilege>http://tizen.org/privilege/internet</privilege>
     </privileges>
     <feature name="http://tizen.org/feature/network.wifi">true</feature>