Build scripts updated for android build issue for connectivity layer

Change-Id: Ia8781f4adbf39529c763521bc6dcfb5c5b4a78c1
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11399
Reviewed-by: Ashwini  Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/build_common/android/SConscript b/build_common/android/SConscript
index 20d7c38..fa45866 100644 (file)
--- a/build_common/android/SConscript
+++ b/build_common/android/SConscript
@@ -221,8 +221,10 @@ env.AppendUnique(LIBPATH = [src_dir + '/resource/csdk/connectivity/lib/android']
 env.AppendUnique(LIBS = ['log', 'coap'])
 
 if env.get('SECURED') == '1':
+       env.SConscript('#extlibs/tinydtls/SConscript')
        env.AppendUnique(LIBS = ['tinydtls'])
        if env.get('WITH_TCP'):
+               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'.

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 6063875..16d654c 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -81,7 +81,8 @@ if ((secured == '1') and (with_tcp == True)):
                env.SConscript(os.path.join(root_dir, tls_path + '/SConscript'))
                env.AppendUnique(CPPPATH = [os.path.join(root_dir, tls_path + '/' + tls_headers_path)])
        else:
-               env.SConscript('#' + tls_path + '/SConscript')
+               if ca_os != 'android':
+                       env.SConscript('#' + tls_path + '/SConscript')
                env.AppendUnique(CPPPATH = ['#' + tls_path + '/' + tls_headers_path])
                env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_tls.c')])