Enabled CoAP/TCP on android platform

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

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
old mode 100644 (file)
new mode 100755 (executable)
index 3572b20..ec68e29
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -10,6 +10,7 @@ ca_os = env.get('TARGET_OS')
 ca_transport = env.get('TARGET_TRANSPORT')
 secured = env.get('SECURED')
 with_ra = env.get ('WITH_RA')
+with_tcp = env.get('WITH_TCP')
 root_dir = os.pardir
 ca_path = os.curdir
 
@@ -40,10 +41,10 @@ env.SConscript('./../common/SConscript')
 # is interpreted by SCons as the top-level iotivity directory where
 # the SConscruct file is found.
 if env.get('SECURED') == '1':
-        if ca_os == 'tizen':
-                env.SConscript(os.path.join(root_dir, 'extlibs/tinydtls/SConscript'))
-        else:
-                env.SConscript('#extlibs/tinydtls/SConscript')
+       if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/tinydtls'):
+               env.SConscript(os.path.join(root_dir, 'extlibs/tinydtls/SConscript'))
+       else:
+               env.SConscript('#extlibs/tinydtls/SConscript')
 
 env.AppendUnique(CA_SRC = [os.path.join(ca_path,
                                         'adapter_util/caadapterutils.c')])
@@ -99,10 +100,10 @@ else:
                env.AppendUnique(CPPDEFINES = ['WITH_BWT'])
        if secured == '1':
                env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
-                if ca_os == 'tizen':
-                        env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/tinydtls')])
-                else:
-                        env.AppendUnique(CPPPATH = ['#extlibs/tinydtls'])
+               if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/tinydtls'):
+                       env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/tinydtls')])
+               else:
+                       env.AppendUnique(CPPPATH = ['#extlibs/tinydtls'])
 
 ca_common_src = [
         os.path.join(ca_path, d) for d in ca_common_src ]
@@ -111,8 +112,6 @@ env.AppendUnique(CA_SRC = ca_common_src)
 
 if 'ALL' in ca_transport:
                transports = [ 'ip_adapter', 'bt_edr_adapter', 'bt_le_adapter']
-               if ca_os == 'linux':
-                               transports.append ('tcp_adapter')
                if with_ra:
                                transports.append ('ra_adapter')
                env.SConscript(dirs = [
@@ -127,8 +126,9 @@ if 'BT' in ca_transport:
 if 'BLE' in ca_transport:
        env.SConscript(os.path.join(ca_path, 'bt_le_adapter/SConscript'))
 
-if 'TCP' in ca_transport:
-       env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript'))
+if ca_os in ['linux', 'tizen', 'android']:
+       if with_tcp == True:
+               env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript'))
 
 print "Include path is %s" % env.get('CPPPATH')
 print "Files path is %s" % env.get('CA_SRC')
@@ -142,5 +142,4 @@ if ca_os in ['android', 'tizen']:
 else:
        calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
 env.InstallTarget(calib, 'libconnectivity_abstraction')
-env.UserInstallTargetLib(calib, 'libconnectivity_abstraction')