replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / build_common / android / SConscript

diff --git a/build_common/android/SConscript b/build_common/android/SConscript
index f24c038..2de28b1 100644 (file)
--- 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,6 @@ 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'])