From ddecc6e67ba587b7fcba0080e6888fe8be5e6014 Mon Sep 17 00:00:00 2001 From: HyunJun Kim Date: Thu, 23 Apr 2015 11:08:32 +0900 Subject: [PATCH] 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 Signed-off-by: HyunJun Kim Reviewed-on: https://gerrit.iotivity.org/gerrit/808 Reviewed-by: Uze Choi Tested-by: Uze Choi --- resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript | 8 ++++++-- resource/csdk/connectivity/src/SConscript | 2 +- .../things-manager/sampleapp/tizen/TMSampleApp/tizen-manifest.xml | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) 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 --- 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 --- 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 --- a/service/things-manager/sampleapp/tizen/TMSampleApp/tizen-manifest.xml +++ b/service/things-manager/sampleapp/tizen/TMSampleApp/tizen-manifest.xml @@ -6,6 +6,7 @@ tmsampleapp.png + http://tizen.org/privilege/network.get http://tizen.org/privilege/internet true -- 2.7.4