X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build_common%2Fandroid%2FSConscript;h=2de28b1f117a435411f2e7c016b99d8536430947;hb=refs%2Ftags%2Faccepted%2Ftizen%2Funified%2F20171010.063815;hp=e0c4c804d3d8978a0bb630058eee720aef10c877;hpb=fb78f5bdd5eef8a9663cc3d665951d104a8aeb61;p=platform%2Fupstream%2Fiotivity.git

diff --git a/build_common/android/SConscript b/build_common/android/SConscript
index e0c4c80..2de28b1 100644
--- a/build_common/android/SConscript
+++ b/build_common/android/SConscript
@@ -153,6 +153,21 @@ for flags in p.stdout.readlines():
 		env.AppendUnique(CXXFLAGS = Split(flags[9:]))
 
 	elif cmp(flags[0:8], 'CPPPATH=') == 0:
+		ndk_arch = 'arch-'
+		if cmp(target_arch, 'x86') == 0:
+			ndk_arch += 'x86'
+		elif cmp(target_arch, 'x86_64') == 0:
+			ndk_arch += 'x86_64'
+		elif cmp(target_arch, 'armeabi') == 0:
+			ndk_arch += 'arm'
+		elif cmp(target_arch, 'armeabi-v7a') == 0:
+			ndk_arch += 'arm'
+		elif cmp(target_arch, 'armeabi-v7a-hard') == 0:
+			ndk_arch += 'arm'
+		elif cmp(target_arch, 'arm64-v8a') == 0:
+			ndk_arch += 'arm64'
+
+		env.AppendUnique(CPPPATH = android_ndk+'/platforms/android-21/'+ndk_arch+'/usr/include')
 		env.AppendUnique(CPPPATH = Split(flags[8:]))
 
 	elif cmp(flags[0:8], 'SYSROOT=') == 0:
@@ -165,9 +180,8 @@ for flags in p.stdout.readlines():
 	elif cmp(flags[0:7], 'TC_VER=') == 0:  # set gnustl library path
 		ver = flags[7:].strip()
 		stl_path = android_ndk + '/sources/cxx-stl/gnu-libstdc++/' + ver + '/libs/' + target_arch
-		if target_arch in ['armeabi', 'armeabi-v7a', 'armeabi-v7a-hard']:
-			stl_path = stl_path + '/thumb/'
-
+#		if target_arch in ['armeabi', 'armeabi-v7a', 'armeabi-v7a-hard']:
+#        		stl_path = stl_path + '/thumb/'
 		env.AppendUnique(LIBPATH = [stl_path])
 		env.Install(env.get('BUILD_DIR'), stl_path + '/libgnustl_shared.so')
 
@@ -221,7 +235,8 @@ env.AppendUnique(LIBPATH = [src_dir + '/resource/csdk/connectivity/lib/android']
 env.AppendUnique(LIBS = ['log', 'coap'])
 
 if env.get('SECURED') == '1':
-	env.AppendUnique(LIBS = ['tinydtls'])
+	env.SConscript('#extlibs/mbedtls/SConscript')
+	env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
 
 # From android-5 (API > 20), all application must be built with flags '-fPIE' '-pie'.
 # Due to the limitation of Scons, it's required to added it into the command line