Fix android build error with ALL

Add nfc adapter

Change-Id: Ia113b01d198f0c6f10e6df1ce1af779ad823ecaa
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index f1d4c45..6385cd7 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -122,6 +122,8 @@ if 'ALL' in ca_transport:
                transports = [ 'ip_adapter', 'bt_edr_adapter', 'bt_le_adapter']
                if with_ra:
                                transports.append ('ra_adapter')
+               if ca_os in ['android']:
+                               transports.append ('nfc_adapter')
                env.SConscript(dirs = [
                                os.path.join(ca_path, d) for d in transports ])
 
@@ -134,6 +136,9 @@ if 'BT' in ca_transport:
 if 'BLE' in ca_transport:
        env.SConscript(os.path.join(ca_path, 'bt_le_adapter/SConscript'))
 
+if 'NFC' in ca_transport:
+       env.SConscript(os.path.join(ca_path, 'nfc_adapter/SConscript'))
+
 if ca_os in ['linux', 'tizen', 'android']:
        if with_tcp == True:
                env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript'))
@@ -143,9 +148,6 @@ if ca_os in ['linux', 'tizen', 'android', 'arduino', 'ios']:
        if (('BLE' in ca_transport) or ('BT' in ca_transport) or ('ALL' in ca_transport)):
                env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
 
-if 'NFC' in ca_transport:
-       env.SConscript(os.path.join(ca_path, 'nfc_adapter/SConscript'))
-
 print "Include path is %s" % env.get('CPPPATH')
 print "Files path is %s" % env.get('CA_SRC')
 if ca_os in ['android', 'tizen']: