X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2FSConscript;h=893dc5c497857b7c012d89671e47646bf7e6fcbb;hb=390866079e285d2c74918432c0d597d5da52f8a0;hp=5de9342fbf08a2ab566514e637fbf67032e8eacd;hpb=3e9402ad71cb3e93266a77796f44d17bab9853fd;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/SConscript b/resource/csdk/connectivity/SConscript
index 5de9342..893dc5c 100644
--- a/resource/csdk/connectivity/SConscript
+++ b/resource/csdk/connectivity/SConscript
@@ -31,6 +31,8 @@ if 'ALL' in transport:
 		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 == 'android':
+		env.AppendUnique(CPPDEFINES = ['IP_ADAPTER','EDR_ADAPTER','LE_ADAPTER', 'NFC_ADAPTER'])
 	elif target_os in['darwin','ios']:
 		env.AppendUnique(CPPDEFINES = ['IP_ADAPTER','NO_EDR_ADAPTER','NO_LE_ADAPTER'])
 	else:
@@ -60,8 +62,8 @@ else:
 		env.AppendUnique(CPPDEFINES = ['NO_IP_ADAPTER'])
 
 	if with_tcp == True:
-		if target_os in ['linux', 'tizen']:
-			env.AppendUnique(CPPDEFINES = ['TCP_ADAPTER'])
+		if target_os in ['linux', 'tizen', 'android']:
+			env.AppendUnique(CPPDEFINES = ['TCP_ADAPTER', 'WITH_TCP'])
 			print "CA Transport is TCP"
 		else:
 			print "CA Transport TCP is not supported "
@@ -69,6 +71,16 @@ else:
 	else:
 		env.AppendUnique(CPPDEFINES = ['NO_TCP_ADAPTER'])
 
+	if 'NFC' in transport:
+		if target_os in['android']:
+			env.AppendUnique(CPPDEFINES = ['NFC_ADAPTER'])
+			print "CA Transport is NFC"
+		else:
+			print "CA Transport NFC is not supported "
+			Exit(1)
+	else:
+		env.AppendUnique(CPPDEFINES = ['NO_NFC_ADAPTER'])
+
 env.SConscript('./src/SConscript')
 
 if build_sample == 'ON':