Update RD with latest master

Change-Id: Ifaa16985f8bbc59bcf8d81aa03696ee3f6d784ae
Signed-off-by: Habib Virji <habib.virji@samsung.com>

diff --cc auto_build.sh
Simple merge

diff --cc build_common/SConscript
Simple merge

diff --cc resource/csdk/SConscript
index 1f3b67b,9f887e9..edc083f
--- 1/resource/csdk/SConscript
--- 2/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@@ -96,13 -101,11 +101,16 @@@ if env.get('SECURED') == '1'
  if env.get('LOGGING'):
        liboctbstack_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
  
 +if env.get('WITH_RD') == '1':
 +      liboctbstack_env.PrependUnique(CPPPATH = ['../../service/resource-directory/include'])
 +      liboctbstack_env.AppendUnique(CPPDEFINES = ['-DWITH_RD'])
 +      liboctbstack_env.AppendUnique(LIBS = ['resource_directory'])
 +
  liboctbstack_env.Append(LIBS = ['c_common'])
  
+ if liboctbstack_env.get('ROUTING') in ['GW', 'EP']:
+       liboctbstack_env.Prepend(LIBS = ['routingmanager'])
+ 
  ######################################################################
  # Source files and Targets
  ######################################################################

diff --cc resource/csdk/stack/include/ocpayload.h
index 7abe6ab,37d56f9..e90558c
mode 100644,100755..100755
--- 1/resource/csdk/stack/include/ocpayload.h
--- 2/resource/csdk/stack/include/ocpayload.h
+++ b/resource/csdk/stack/include/ocpayload.h
@@@ -23,13 -23,8 +23,12 @@@
  
  #include <stdbool.h>
  #include <inttypes.h>
- #include "logger.h"
  #include "octypes.h"
  
 +#ifdef WITH_RD
 +#include "rd_payload.h"
 +#endif
 +
  #ifdef __cplusplus
  extern "C"
  {

diff --cc resource/csdk/stack/include/octypes.h
Simple merge

diff --cc resource/csdk/stack/include/payload_logging.h
index 5bfb5bb,691bf08..797c8b3
--- 1/resource/csdk/stack/include/payload_logging.h
--- 2/resource/csdk/stack/include/payload_logging.h
+++ b/resource/csdk/stack/include/payload_logging.h
@@@ -236,30 -242,25 +242,30 @@@ static inline void OCPayloadLog(LogLeve
      switch(payload->type)
      {
          case PAYLOAD_TYPE_REPRESENTATION:
-             OCPayloadLogRep(level, tag, (OCRepPayload*)payload);
+             OCPayloadLogRep(level, (OCRepPayload*)payload);
              break;
          case PAYLOAD_TYPE_DISCOVERY:
-             OCPayloadLogDiscovery(level, tag, (OCDiscoveryPayload*)payload);
+             OCPayloadLogDiscovery(level, (OCDiscoveryPayload*)payload);
              break;
          case PAYLOAD_TYPE_DEVICE:
-             OCPayloadLogDevice(level, tag, (OCDevicePayload*)payload);
+             OCPayloadLogDevice(level, (OCDevicePayload*)payload);
              break;
          case PAYLOAD_TYPE_PLATFORM:
-             OCPayloadLogPlatform(level, tag, (OCPlatformPayload*)payload);
+             OCPayloadLogPlatform(level, (OCPlatformPayload*)payload);
              break;
          case PAYLOAD_TYPE_PRESENCE:
-             OCPayloadLogPresence(level, tag, (OCPresencePayload*)payload);
+             OCPayloadLogPresence(level, (OCPresencePayload*)payload);
              break;
          case PAYLOAD_TYPE_SECURITY:
-             OCPayloadLogSecurity(level, tag, (OCSecurityPayload*)payload);
+             OCPayloadLogSecurity(level, (OCSecurityPayload*)payload);
              break;
 +#ifdef WITH_RD
 +        case PAYLOAD_TYPE_RD:
 +            OCRDPayloadLog(level, tag, (OCRDPayload*)payload);
 +            break;
 +#endif
          default:
-             OC_LOG_V(level, tag, "Unknown Payload Type: %d", payload->type);
+             OC_LOG_V(level, PL_TAG, "Unknown Payload Type: %d", payload->type);
              break;
      }
  }

diff --cc resource/csdk/stack/src/ocpayload.c
index 020ae2a,6be1ffe..8145378
mode 100644,100755..100755
--- 1/resource/csdk/stack/src/ocpayload.c
--- 2/resource/csdk/stack/src/ocpayload.c
+++ b/resource/csdk/stack/src/ocpayload.c

diff --cc resource/csdk/stack/src/ocpayloadconvert.c
Simple merge

diff --cc resource/csdk/stack/src/ocpayloadparse.c
Simple merge

diff --cc resource/csdk/stack/src/ocresource.c
index 92eed58,95265bb..c927807
--- 1/resource/csdk/stack/src/ocresource.c
--- 2/resource/csdk/stack/src/ocresource.c
+++ b/resource/csdk/stack/src/ocresource.c
@@@ -35,12 -35,11 +35,16 @@@
  #include "logger.h"
  #include "cJSON.h"
  #include "ocpayload.h"
- 
+ #include "secureresourcemanager.h"
  #include "cacommon.h"
  #include "cainterface.h"
 +
 +#ifdef WITH_RD
 +#include "rd_server.h"
++#endif 
++
+ #ifdef ROUTING_GATEWAY
+ #include "routingmanager.h"
  #endif
  
  /// Module Name

diff --cc service/SConscript
index 7d3a5d2,be349be..f712f25
--- 1/service/SConscript
--- 2/service/SConscript
+++ b/service/SConscript
@@@ -39,15 -39,9 +39,12 @@@ if target_os not in ['arduino','darwin'
                SConscript('protocol-plugin/SConscript')
  
        # Build notification manager project
-       if target_os not in ['android', 'tizen']:
-               SConscript('notification-manager/SConscript')
- 
+       SConscript('notification-manager/SConscript')
+       
        # Build resource-encapsulation project
-       if target_os not in ['android', 'tizen']:
+       if target_os not in ['tizen']:
                SConscript('resource-encapsulation/SConscript')
  
- #else:
- #     SConscript('notification-manager/SampleApp/arduino/SConscript')
 +      # Build resource directory project
 +      if env.get('WITH_RD') == '1':
 +              SConscript('resource-directory/SConscript')