From f58798cf06d217a4e0bbef7f324f5da71b93d043 Mon Sep 17 00:00:00 2001 From: Lukasz Foniok Date: Wed, 7 Jan 2015 11:18:27 +0100 Subject: [PATCH] [Compatibility] The bringing together mobile and tv compilation. [Verification] Code compiles without errors on tv and mobile profile. Change-Id: I0d335c43e5ccabc271c680064074c852608f6897 Signed-off-by: Lukasz Foniok --- src/archive/archive_instance.cc | 6 +++--- src/common/current_application.cc | 1 + src/tizen-wrt.gyp | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/archive/archive_instance.cc b/src/archive/archive_instance.cc index dc88057..ab28f2e 100644 --- a/src/archive/archive_instance.cc +++ b/src/archive/archive_instance.cc @@ -438,9 +438,9 @@ void ArchiveInstance::GetWidgetPaths(const picojson::value& args, picojson::obje picojson::value result{picojson::object()}; auto& result_obj = result.get(); - result_obj.insert(std::make_pair("wgt-package", root + "/res/wgt")); - result_obj.insert(std::make_pair("wgt-private", root + "/data")); - result_obj.insert(std::make_pair("wgt-private-tmp", root + "/tmp")); + result_obj.insert(std::make_pair("wgt-package", picojson::value(root + "/res/wgt"))); + result_obj.insert(std::make_pair("wgt-private", picojson::value(root + "/data"))); + result_obj.insert(std::make_pair("wgt-private-tmp", picojson::value(root + "/tmp"))); ReportSuccess(result, out); } diff --git a/src/common/current_application.cc b/src/common/current_application.cc index 70d63ba..c9180de 100644 --- a/src/common/current_application.cc +++ b/src/common/current_application.cc @@ -18,6 +18,7 @@ #include #include +#include #include "common/logger.h" diff --git a/src/tizen-wrt.gyp b/src/tizen-wrt.gyp index 806ec8a..412d271 100644 --- a/src/tizen-wrt.gyp +++ b/src/tizen-wrt.gyp @@ -12,10 +12,7 @@ 'time/time.gyp:*', 'utils/utils.gyp:*', 'messageport/messageport.gyp:*', - 'bookmark/bookmark.gyp:*', #'datasync/datasync.gyp:*', - 'contact/contact.gyp:*', - 'messaging/messaging.gyp:*', 'archive/archive.gyp:*', 'exif/exif.gyp:*', ], -- 2.7.4