From 0327d5a64e4f3eb2d1c6725f30543f0575c08c9d Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 6 Oct 2016 15:45:15 +0200 Subject: [PATCH] tizen: Use sqlite from system not scon puller Change-Id: Id4382d37d34e5ac7d023e38bebd60228c6e6860e Bug: https://jira.iotivity.org/browse/IOT-1296 Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/12913 Tested-by: jenkins-iotivity (cherry picked from commit d1ee9e78d898746b842a2439f88d26fd30a377bc) Reviewed-on: https://gerrit.iotivity.org/gerrit/13041 --- service/easy-setup/enrollee/SConscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript index 400ff7a..a09b37d 100644 --- a/service/easy-setup/enrollee/SConscript +++ b/service/easy-setup/enrollee/SConscript @@ -47,11 +47,14 @@ enrollee_env.PrependUnique(CPPPATH = [ enrollee_env.get('SRC_DIR') + '/resource/csdk/logger/include', enrollee_env.get('SRC_DIR') + '/resource/csdk/security/include', enrollee_env.get('SRC_DIR') + '/extlibs/cjson', - enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3', enrollee_env.get('SRC_DIR') + '/service/easy-setup/inc', enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/inc', enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src']) +if target_os not in ['tizen']: + enrollee_env.PrependUnique(CPPPATH = [ + enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3']) + if enrollee_env.get('SECURED') == '1': enrollee_env.AppendUnique(CPPPATH = [ enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include', -- 2.7.4