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 <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/708
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>

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 (file)
--- 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')