From 4e78e065015ecd8b33c9cfe9276ac6ac970a3537 Mon Sep 17 00:00:00 2001 From: Erich Keane Date: Mon, 13 Apr 2015 15:37:25 -0700 Subject: [PATCH] Fixed Android Build error caused by merge issue Apparently while merging the Sconscript for the libcoap directory, I managed to grab some lines from somewhere else(I have no idea where from!). This was a mistake, so I'm reverting this file back to have the identical functionality as the CA branch, since this doesn't exist on the pre-merge master branch. Change-Id: I8fcfe692e4e4ab35666ed4a5f02041faffa440c0 Signed-off-by: Erich Keane Reviewed-on: https://gerrit.iotivity.org/gerrit/708 Tested-by: jenkins-iotivity Reviewed-by: Rahul Rahul --- resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript index 99d45ea..485f161 100644 --- a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript +++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript @@ -66,10 +66,5 @@ libcoap_src = [ 'block.c' ] -if target_os in ['arduino','darwin','ios']: - static_libcoap = libcoap_env.StaticLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_') - libcoap_env.InstallTarget(static_libcoap, 'libcoap') -else: - static_libcoap = libcoap_env.StaticLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_') - shared_libcoap = libcoap_env.SharedLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_') - libcoap_env.InstallTarget([static_libcoap, shared_libcoap], 'libcoap') +libcoap = libcoap_env.StaticLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_') +libcoap_env.InstallTarget(libcoap, 'libcoap') -- 2.7.4