IOT-1985: Fixing SimpleClientServer include paths.

SimpleClientServer adds libcoap to its include paths,
which is no longer needed.

Change-Id: I613205e50d1b2f45ae51fa5eed9e036f6d6cc151
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18411
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
index f29a43b..8e708c0 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
@@ -29,16 +29,6 @@ with_ra = samples_env.get('WITH_RA')
 ######################################################################
 # Build flags
 ######################################################################
-with_upstream_libcoap = samples_env.get('WITH_UPSTREAM_LIBCOAP')
-if with_upstream_libcoap == '1':
-    # For bring up purposes only, we manually copy the forked version to where
-    # the unforked version is downloaded.
-    samples_env.AppendUnique(CPPPATH=['#extlibs/libcoap/libcoap/include'])
-else:
-    # For bring up purposes only, the forked version will live here.
-    samples_env.AppendUnique(
-        CPPPATH=['../../../../../connectivity/lib/libcoap-4.1.1/include'])
-
 samples_env.PrependUnique(CPPPATH=[
     '../../../../logger/include',
     '../../../../include',