Revert "Temporary fix for hybrid pkg installation"

This reverts commit 8c6fc81fabd0d348c8ab57af6ac6f7fd376e8cd1.

Conflicts:
	src/wgt/step/pkgmgr/step_generate_xml.cc

Now hybrid installer can merge manifest completely.

Submit with:
 - https://review.tizen.org/gerrit/107236
 - https://review.tizen.org/gerrit/107237
 - https://review.tizen.org/gerrit/107238
 - https://review.tizen.org/gerrit/107239

Change-Id: Id054359ba9fb3a04cfee67ba1dbd8afd83ca8082
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/src/wgt/step/pkgmgr/step_generate_xml.cc b/src/wgt/step/pkgmgr/step_generate_xml.cc
index a23e71e..7da9f76 100644 (file)
--- a/src/wgt/step/pkgmgr/step_generate_xml.cc
+++ b/src/wgt/step/pkgmgr/step_generate_xml.cc
@@ -98,17 +98,6 @@ bool WriteWidgetApplicationAttributesAndElements(
     xmlTextWriterWriteAttribute(writer, BAD_CAST "main",
         BAD_CAST app->mainapp);
 
-  // FIXME: For hotfix, must be removed
-  if (app->support_sizes) {
-    for (auto& ss : GListRange<support_size_x*>(app->support_sizes)) {
-      xmlTextWriterStartElement(writer, BAD_CAST "support-size");
-      xmlTextWriterWriteAttribute(writer, BAD_CAST "preview",
-          BAD_CAST ss->preview);
-      xmlTextWriterWriteString(writer, BAD_CAST ss->size);
-      xmlTextWriterEndElement(writer);
-    }
-  }
-
   auto& appwidgets = widget_info.app_widgets();
   const auto& appwidget = std::find_if(appwidgets.begin(), appwidgets.end(),
                                  [app](const wgt::parse::AppWidget& widget) {