[TIZEN] Fix broken build caused by c_common merge

Tizen build was broken after merging of oic_malloc / oic_string.

Change-Id: I81ed8e5e5d5d13fd741ec66ac108f58430c8dcb9
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/c_common/SConscript b/resource/c_common/SConscript
index ff0513b..c2741a1 100644 (file)
--- a/resource/c_common/SConscript
+++ b/resource/c_common/SConscript
@@ -26,7 +26,12 @@ env.AppendUnique(CPPPATH = [
             os.path.join(Dir('.').abspath, 'oic_malloc/include'),
             os.path.join(Dir('.').abspath, 'oic_string/include')
         ])
-env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource/c_common')])
+
+if env.get('TARGET_OS') == 'tizen':
+       env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+else:
+       env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource/c_common')])
+
 env.AppendUnique(LIBS = ['c_common'])
 
 common_env = env.Clone()

diff --git a/resource/csdk/connectivity/build/tizen/gbsbuild.sh b/resource/csdk/connectivity/build/tizen/gbsbuild.sh
index 682d61d..48743d9 100755 (executable)
--- a/resource/csdk/connectivity/build/tizen/gbsbuild.sh
+++ b/resource/csdk/connectivity/build/tizen/gbsbuild.sh
@@ -52,6 +52,8 @@ mkdir -p $sourcedir/tmp/con/sample/external/inc
 cp -R $cur_dir/external/inc/* $sourcedir/tmp/con/sample/external/inc/
 mkdir -p $sourcedir/tmp/con/extlibs/
 cp -R ./extlibs/tinydtls/ $sourcedir/tmp/con/extlibs/
+mkdir -p $sourcedir/tmp/con/c_common
+cp -R ./resource/c_common/* $sourcedir/tmp/con/c_common/
 
 cd $sourcedir
 cd $cur_dir/build/tizen

diff --git a/resource/csdk/connectivity/build/tizen/scons/SConscript b/resource/csdk/connectivity/build/tizen/scons/SConscript
index 318d954..9a9644d 100644 (file)
--- a/resource/csdk/connectivity/build/tizen/scons/SConscript
+++ b/resource/csdk/connectivity/build/tizen/scons/SConscript
@@ -44,3 +44,4 @@ else:
 
 env.SConscript(['../con/lib/libcoap-4.1.1/SConscript'])
 env.SConscript(['../con/SConscript'])
+env.SConscript(['../con/c_common/SConscript'])