From f115d4d8aba3fdb4544b2aa86c438ddc9f7a52e0 Mon Sep 17 00:00:00 2001 From: Jaehong Jo Date: Sun, 21 Feb 2016 15:39:07 +0900 Subject: [PATCH] Fix android build error with ALL Add nfc adapter Change-Id: Ia113b01d198f0c6f10e6df1ce1af779ad823ecaa Signed-off-by: Jaehong Jo Reviewed-on: https://gerrit.iotivity.org/gerrit/5091 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- resource/csdk/connectivity/src/SConscript | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript index f1d4c45..6385cd7 100644 --- 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']: -- 2.7.4