From: Sangyoon Jang Date: Mon, 17 Oct 2016 11:51:42 +0000 (+0900) Subject: Temporary fix for hybrid pkg installation X-Git-Tag: accepted/tizen/3.0/mobile/20161028.122420 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2F3.0%2Fmobile%2F20161028.122420;p=platform%2Fcore%2Fappfw%2Fapp-installers.git Temporary fix for hybrid pkg installation Submit together: - https://review.tizen.org/gerrit/92582 - https://review.tizen.org/gerrit/92583 - https://review.tizen.org/gerrit/92584 Change-Id: I7c384edb28e298b6eb7484ee604a03bf686a6684 Signed-off-by: Sangyoon Jang --- diff --git a/src/common/step/configuration/step_parse_manifest.cc b/src/common/step/configuration/step_parse_manifest.cc index 215e69e..be9abdd 100644 --- a/src/common/step/configuration/step_parse_manifest.cc +++ b/src/common/step/configuration/step_parse_manifest.cc @@ -372,6 +372,9 @@ bool StepParseManifest::FillWidgetApplication(manifest_x* manifest) { return false; if (!FillMetadata(widget_app, application.meta_data)) return false; + // FIXME: For hotfix, must be removed + if (!FillSupportSize(widget_app, application.support_sizes)) + return false; } return true; } @@ -706,6 +709,23 @@ bool StepParseManifest::FillMetadata(application_x* app, return true; } +// FIXME: For hotfix, must be removed +template +bool StepParseManifest::FillSupportSize(application_x* app, + const T& support_size_list) { + if (support_size_list.empty()) + return true; + + for (auto& ss : support_size_list) { + support_size_x* support_size = + static_cast(calloc(1, sizeof(support_size_x))); + support_size->preview = strdup(ss.preview().c_str()); + support_size->size = strdup(ss.size().c_str()); + app->support_sizes = g_list_append(app->support_sizes, support_size); + } + return true; +} + template bool StepParseManifest::FillCategories(application_x* manifest, const T& categories) { diff --git a/src/common/step/configuration/step_parse_manifest.h b/src/common/step/configuration/step_parse_manifest.h index 79d81dc..1e8d7af 100644 --- a/src/common/step/configuration/step_parse_manifest.h +++ b/src/common/step/configuration/step_parse_manifest.h @@ -84,6 +84,9 @@ class StepParseManifest : public common_installer::Step { bool FillLabel(application_x* manifest, const T& label_list); template bool FillMetadata(application_x* manifest, const T& meta_data_list); + // FIXME: For hotfix, must be removed + template + bool FillSupportSize(application_x* manifest, const T& support_size_list); template bool FillCategories(application_x* manifest, const T& meta_data_list); bool FillImage(application_x* app,