Merge branch '1.1-rel'

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / SConscript

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 897e390..3c671a3 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -131,6 +131,11 @@ if 'ALL' in ca_transport:
 
 if 'IP' in ca_transport:
        env.SConscript(os.path.join(ca_path, 'ip_adapter/SConscript'))
+       if ca_os == 'arduino':
+               if with_tcp:
+                       transports = [ 'ip_adapter', 'tcp_adapter']
+                       env.SConscript(dirs = [
+                               os.path.join(ca_path, d) for d in transports ])
 
 if 'BT' in ca_transport:
        env.SConscript(os.path.join(ca_path, 'bt_edr_adapter/SConscript'))
@@ -152,15 +157,21 @@ if ca_os in ['linux', 'tizen', 'android', 'arduino', 'ios']:
 
 print "Include path is %s" % env.get('CPPPATH')
 print "Files path is %s" % env.get('CA_SRC')
+               
+lib_env = env.Clone()
+
+if ca_os == 'android':
+    lib_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libconnectivity_abstraction.so'])
+
 if ca_os in ['android', 'tizen']:
-       env.AppendUnique(LIBS = ['coap'])
-       if env.get('SECURED') == '1':
-               env.AppendUnique(LIBS = ['tinydtls'])
-               env.AppendUnique(LIBS = ['timer'])
+       lib_env.AppendUnique(LIBS = ['coap'])
+       if lib_env.get('SECURED') == '1':
+               lib_env.AppendUnique(LIBS = ['tinydtls'])
+               lib_env.AppendUnique(LIBS = ['timer'])
        if ca_os != 'android':
-               env.AppendUnique(LIBS = ['rt'])
-       calib = env.SharedLibrary('connectivity_abstraction', env.get('CA_SRC'))
+               lib_env.AppendUnique(LIBS = ['rt'])
+       calib = lib_env.SharedLibrary('connectivity_abstraction', lib_env.get('CA_SRC'))
 else:
-       calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
-env.InstallTarget(calib, 'libconnectivity_abstraction')
-env.UserInstallTargetLib(calib, 'libconnectivity_abstraction')
+       calib = lib_env.StaticLibrary('connectivity_abstraction', lib_env.get('CA_SRC'))
+lib_env.InstallTarget(calib, 'libconnectivity_abstraction')
+lib_env.UserInstallTargetLib(calib, 'libconnectivity_abstraction')