X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fresource-container%2FSConscript;h=551d054700af314c14c046c4f681ac859d989527;hb=9dae1cd32d99938b6f86e2337229d54cac26bb5e;hp=770cede0560568d99a14918c8c0a20578ab3f254;hpb=c896ef09c14ae37a920bc026d3302f0d76a16a6e;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/resource-container/SConscript b/service/resource-container/SConscript
index 770cede..551d054 100644
--- a/service/resource-container/SConscript
+++ b/service/resource-container/SConscript
@@ -37,7 +37,7 @@ env.AddMethod(filtered_glob, "FilteredGlob");
 
 # Add third party libraries
 lib_env = env.Clone()
-SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', exports = 'lib_env')
+SConscript('#service/third_party_libs.scons', exports = 'lib_env')
 
 resource_container_env = lib_env.Clone()
 target_os = env.get('TARGET_OS')
@@ -113,6 +113,10 @@ resource_container_env.AppendUnique(LIBS = ['boost_system'])
 resource_container_env.AppendUnique(LIBS = ['boost_date_time'])
 resource_container_env.AppendUnique(LIBS = ['boost_thread'])
 
+if resource_container_env.get('SECURED') == '1':
+	if resource_container_env.get('WITH_TCP') == True:
+		resource_container_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
+
 if int(containerJavaSupport):
     try:
         print 'Java Lib: ', os.environ['JAVA_LIB']
@@ -152,7 +156,7 @@ if target_os in ['linux', 'tizen', 'android']:
     DI_sensor_bundle_env.InstallTarget(DISensorBundle, 'libDISensorBundle')
     DI_sensor_bundle_env.UserInstallTargetLib(DISensorBundle, 'libDISensorBundle')
 
-    if target_os == 'linux' :
+    if target_os in ['linux']:
         SConscript(DI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript')
         Command("THSensorApp", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp/THSensorApp", Copy("$TARGET", "$SOURCE"))
         Command("THSensorApp1", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp1/THSensorApp1", Copy("$TARGET", "$SOURCE"))
@@ -175,7 +179,7 @@ if target_os in ['linux', 'tizen', 'android']:
     BMI_sensor_bundle_env.InstallTarget(BMISensorBundle, 'libBMISensorBundle')
     BMI_sensor_bundle_env.UserInstallTargetLib(BMISensorBundle, 'libBMISensorBundle')
 
-    if target_os == 'linux' :
+    if target_os in ['linux']:
         SConscript(BMI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript')
         Command("HeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/HeightSensorApp/HeightSensorApp", Copy("$TARGET", "$SOURCE"))
         Command("WeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/WeightSensorApp/WeightSensorApp", Copy("$TARGET", "$SOURCE"))
@@ -218,7 +222,7 @@ lib_env = conf2.Finish()
 ######################################################################
 # build resource container unit tests
 ######################################################################
-if target_os == 'linux':
+if target_os in ['linux']:
     SConscript('unittests/SConscript')
 
 ######################################################################