diff options
| author | Philippe Coval <philippe.coval@osg.samsung.com> | 2017-02-21 18:11:21 +0100 |
|---|---|---|
| committer | Randeep Singh <randeep.s@samsung.com> | 2017-02-23 04:40:29 +0000 |
| commit | 58932715630a14b27438bf39c88f95b527c96706 (patch) | |
| tree | 3f0329995793304acc97bbddc9e7c2c582ef0dc5 /java | |
| parent | d7778f4e3bd23e84edd6d93c6dc0c5df0d832197 (diff) | |
| download | iotivity-58932715630a14b27438bf39c88f95b527c96706.tar.gz iotivity-58932715630a14b27438bf39c88f95b527c96706.tar.bz2 iotivity-58932715630a14b27438bf39c88f95b527c96706.zip | |
build: Remove tinydtls library
[Chul Lee]
Remove tinydtls library
[Philippe Coval]
Ported from 1.2-rel branch to master,
and removed presence is other SConscript.
Conflicts:
service/coap-http-proxy/unittests/SConscript
resource/csdk/SConscript
resource/csdk/connectivity/src/SConscript
resource/csdk/stack/test/SConscript
resource/csdk/security/src/doxmresource.c
Change-Id: I78f470af822587f2cd50eac6e9b1fb4ff5b87219
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16137
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16941
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/jni/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/jni/SConscript b/java/jni/SConscript index 52641ad97..6228e01ae 100644 --- a/java/jni/SConscript +++ b/java/jni/SConscript @@ -67,8 +67,8 @@ jni_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) jni_env.AppendUnique(RPATH = [env.get('BUILD_DIR')]) jni_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction']) if env.get('SECURED') == '1': -# jni_env.AppendUnique(CPPDEFINES= ['__WITH_TLS__']) - jni_env.PrependUnique(LIBS = ['tinydtls', 'ocprovision', 'ocpmapi']) + jni_env.AppendUnique(CPPDEFINES= ['__WITH_TLS__']) + jni_env.PrependUnique(LIBS = ['mbedtls', 'ocprovision', 'ocpmapi']) jni_env.AppendUnique(CPPPATH = ['#resource/csdk/security/include/internal', '#extlibs/cjson']) if env.get('WITH_CLOUD') == '1': |