[IOT-1330] Fixed build error caused by calling tinydtls build script twice
authorGeorge Nash <george.nash@intel.com>
Fri, 30 Sep 2016 20:00:14 +0000 (13:00 -0700)
committerRick Bell <richard.s.bell@intel.com>
Mon, 3 Oct 2016 20:30:43 +0000 (20:30 +0000)
When building android build with SECURED=1 there is no need to call the tinydtls
build script it is build as part of the csdk.

See: resource/csdk/connectivity/src/SConscript line 60

Change-Id: Idf140944f81ca33369a42f2986e526b38882a3f5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
build_common/android/SConscript

index fa45866..dcd6481 100644 (file)
@@ -221,7 +221,6 @@ env.AppendUnique(LIBPATH = [src_dir + '/resource/csdk/connectivity/lib/android']
 env.AppendUnique(LIBS = ['log', 'coap'])
 
 if env.get('SECURED') == '1':
-       env.SConscript('#extlibs/tinydtls/SConscript')
        env.AppendUnique(LIBS = ['tinydtls'])
        if env.get('WITH_TCP'):
                env.SConscript('#extlibs/mbedtls/SConscript')