coap-http-proxy: Removing redundant configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from service/coap-http-proxy/*.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I6e88ec4553850340044a9788bf0c8782bc4283ad
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21323
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>

diff --git a/service/coap-http-proxy/SConscript b/service/coap-http-proxy/SConscript
index 9339559..10259e1 100644 (file)
--- a/service/coap-http-proxy/SConscript
+++ b/service/coap-http-proxy/SConscript
@@ -25,12 +25,8 @@ Import('env')
 import os
 local_env = env.Clone()
 
-if local_env.get('LOGGING'):
-    local_env.AppendUnique(CPPDEFINES=['-DTB_LOG'])
-
 if env.get('RELEASE'):
     local_env.AppendUnique(CCFLAGS=['-Os'])
-    local_env.AppendUnique(CPPDEFINES=['NDEBUG'])
 else:
     local_env.AppendUnique(CCFLAGS=['-g'])
 

diff --git a/service/coap-http-proxy/samples/SConscript b/service/coap-http-proxy/samples/SConscript
index 34641ee..74c6112 100644 (file)
--- a/service/coap-http-proxy/samples/SConscript
+++ b/service/coap-http-proxy/samples/SConscript
@@ -45,7 +45,6 @@ if target_os in ['linux']:
     if not env.get('RELEASE'):
         proxy_sample_app_env.PrependUnique(LIBS=['gcov'])
 
-proxy_sample_app_env.AppendUnique(LIBPATH=[env.get('BUILD_DIR')])
 proxy_sample_app_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 proxy_sample_app_env.PrependUnique(LIBS=[
     'coap_http_proxy',