Merge branch '1.3-rel' (e0704368) 51/21351/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 11 Jul 2017 08:03:35 +0000 (10:03 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 11 Jul 2017 08:03:35 +0000 (10:03 +0200)
Conflicts:
extlibs/mbedtls/SConscript

Change-Id: I936dd2dcc314cc5b16387a397d035e7e3753e58b
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
extlibs/mbedtls/SConscript
service/notification/unittest/SConscript

@@@ -32,7 -32,9 +32,8 @@@ mbedtls_dir = os.path.join(root_dir, 'e
  start_dir = os.getcwd()
  mbedtls_config_file = 'config-iotivity.h' if target_os != 'windows' else 'config-iotivity_windows.h'
  
+ # The mbedtls_revision tag here must match the one in extlibs/mbedtls/prep.sh.
  mbedtls_revision = 'mbedtls-2.4.2'
 -
  if not os.path.exists(mbedtls_dir):
      msg = '''
  *********************************** Error: ************************************