Merge branch 'master' into easysetup & CBOR changes

[contrib/iotivity.git] / resource / csdk / connectivity / SConscript

diff --git a/resource/csdk/connectivity/SConscript b/resource/csdk/connectivity/SConscript
index 381fb9d..777f7d9 100644 (file)
--- a/resource/csdk/connectivity/SConscript
+++ b/resource/csdk/connectivity/SConscript
@@ -7,6 +7,7 @@ Import('env')
 target_os = env.get('TARGET_OS')
 transport = env.get('TARGET_TRANSPORT')
 build_sample = env.get('BUILD_SAMPLE')
+with_ra = env.get('WITH_RA')
 
 print "Given Transport is %s" % transport
 print "Given OS is %s" % target_os
@@ -21,8 +22,10 @@ if target_os in targets_disallow_multitransport:
         Exit(1)
 
 if 'ALL' in transport:
+       if with_ra == True:
+                       env.AppendUnique(CPPDEFINES = ['RA_ADAPTER'])
        if target_os == 'linux':
-               env.AppendUnique(CPPDEFINES = ['IP_ADAPTER','NO_EDR_ADAPTER','NO_LE_ADAPTER'])
+               env.AppendUnique(CPPDEFINES = ['IP_ADAPTER','NO_EDR_ADAPTER','LE_ADAPTER'])
        elif target_os == 'tizen':
                env.AppendUnique(CPPDEFINES = ['IP_ADAPTER','EDR_ADAPTER','LE_ADAPTER'])
        elif target_os in['darwin','ios']:
@@ -42,12 +45,8 @@ else:
                env.AppendUnique(CPPDEFINES = ['NO_EDR_ADAPTER'])
 
        if 'BLE' in transport:
-               if target_os == 'linux':
-                       print "CA Transport BLE is not supported in Linux"
-                       Exit(1)
-               else:
-                       env.AppendUnique(CPPDEFINES = ['LE_ADAPTER'])
-                       print "CA Transport is BLE"
+               env.AppendUnique(CPPDEFINES = ['LE_ADAPTER'])
+               print "CA Transport is BLE"
        else:
                env.AppendUnique(CPPDEFINES = ['NO_LE_ADAPTER'])
 
@@ -58,7 +57,21 @@ else:
                env.AppendUnique(CPPDEFINES = ['NO_IP_ADAPTER'])
 
 env.SConscript('./src/SConscript')
-
 #if build_sample == 'ON':
 #      if target_os in ['linux', 'arduino', 'android']:
 #              env.SConscript('./samples/' + target_os + '/SConscript')
+if build_sample == 'ON':
+       if target_os in ['linux', 'arduino', 'darwin']:
+               target_path = target_os
+
+               if target_os == 'darwin':
+                       target_path = 'linux'
+               env.SConscript('./samples/' + target_path + '/SConscript')
+
+       elif target_os in ['android']:
+               env.SConscript('./samples/' + target_os + '/SConscript')
+
+               #to build sample apk, uncomment below line after ca libraries are built
+               #while building ca libraries comment the below line, to avoid build errors
+
+               #env.SConscript('./samples/' + target_os + '/casample/SConscript')