tizen: Use sqlite from system not scon puller
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 6 Oct 2016 13:45:15 +0000 (15:45 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Fri, 21 Oct 2016 09:02:44 +0000 (09:02 +0000)
Change-Id: Id4382d37d34e5ac7d023e38bebd60228c6e6860e
Bug: https://jira.iotivity.org/browse/IOT-1296
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit d1ee9e78d898746b842a2439f88d26fd30a377bc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13041

service/easy-setup/enrollee/SConscript

index 400ff7a..a09b37d 100644 (file)
@@ -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',