Merge branch '1.4-rel' (44ce6a7) aka 2.0.0 55/26755/1
authorPhilippe Coval <rzr@users.sf.net>
Sat, 11 Aug 2018 07:59:14 +0000 (09:59 +0200)
committerPhilippe Coval <rzr@users.sf.net>
Sat, 11 Aug 2018 07:59:26 +0000 (09:59 +0200)
Relate-to:
      I673cc882862dc99c39623316f0ecdb68d4f69afe
      I92948b4039e464cd2ee02dcdf236a57942bf1992
      I8be9e04196558f81a584bd440b4cdb4aaa01e130
      I160789e7def32ef8022729c7479c16d7843a948f
      I49ddaf5b2dc1123ae79b37d9df3c7dd4d29cc820

Change-Id: I44ce6a7e6e66d593f4947340b863f118ab1b4ed1
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
build_common/SConscript
plugins/unittests/SConscript

@@@ -25,8 -25,7 +25,8 @@@ os_arch_map = 
          'mipsel', 'mips64', 'mips64el', 'i386', 'powerpc', 'sparc', 'aarch64',
          'armv6l', 'armv7l'
      ],
-     'tizen': ['x86', 'x86_64', 'arm', 'arm-v7a', 'armeabi-v7a', 'arm64'],
+     'tizen': ['x86', 'x86_64', 'arm', 'arm-v7a', 'armeabi-v7a', 'arm64', 'armv7l'],
 +    'webos': ['arm'],
      'android': [
          'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard',
          'arm64-v8a'
Simple merge