Fix lib name for wgt-manifest-handlers
authorLukasz Wysocki <l.wysocki@samsung.com>
Thu, 21 Jan 2016 12:32:47 +0000 (13:32 +0100)
committerLukasz Wysocki <l.wysocki@samsung.com>
Thu, 21 Jan 2016 12:51:54 +0000 (13:51 +0100)
Following commits should be merged together:
- https://review.tizen.org/gerrit/#/c/57676/
- https://review.tizen.org/gerrit/#/c/57677/
- https://review.tizen.org/gerrit/#/c/57681/

Change-Id: I2b7f46d47df8f85de5f8d651e1d9032e340883fe

common/application_data.cc
common/application_data.h
common/common.gyp
packaging/crosswalk-tizen.spec
runtime/browser/splash_screen.cc
runtime/browser/splash_screen.h
runtime/runtime.gyp

index 46e813d..a75fe58 100644 (file)
@@ -16,9 +16,9 @@
 
 #include "common/application_data.h"
 
-#include <manifest_handlers/application_manifest_constants.h>
-#include <manifest_handlers/widget_config_parser.h>
 #include <package_manager.h>
+#include <wgt_manifest_handlers/application_manifest_constants.h>
+#include <wgt_manifest_handlers/widget_config_parser.h>
 
 #include <vector>
 
index 5831cf3..7902ccd 100644 (file)
 #ifndef XWALK_COMMON_APPLICATION_DATA_H_
 #define XWALK_COMMON_APPLICATION_DATA_H_
 
-#include <manifest_handlers/application_icons_handler.h>
-#include <manifest_handlers/appwidget_handler.h>
-#include <manifest_handlers/app_control_handler.h>
-#include <manifest_handlers/category_handler.h>
-#include <manifest_handlers/content_handler.h>
-#include <manifest_handlers/csp_handler.h>
-#include <manifest_handlers/ime_handler.h>
-#include <manifest_handlers/metadata_handler.h>
-#include <manifest_handlers/navigation_handler.h>
-#include <manifest_handlers/permissions_handler.h>
-#include <manifest_handlers/service_handler.h>
-#include <manifest_handlers/setting_handler.h>
-#include <manifest_handlers/splash_screen_handler.h>
-#include <manifest_handlers/tizen_application_handler.h>
-#include <manifest_handlers/warp_handler.h>
-#include <manifest_handlers/widget_handler.h>
+#include <wgt_manifest_handlers/application_icons_handler.h>
+#include <wgt_manifest_handlers/appwidget_handler.h>
+#include <wgt_manifest_handlers/app_control_handler.h>
+#include <wgt_manifest_handlers/category_handler.h>
+#include <wgt_manifest_handlers/content_handler.h>
+#include <wgt_manifest_handlers/csp_handler.h>
+#include <wgt_manifest_handlers/ime_handler.h>
+#include <wgt_manifest_handlers/metadata_handler.h>
+#include <wgt_manifest_handlers/navigation_handler.h>
+#include <wgt_manifest_handlers/permissions_handler.h>
+#include <wgt_manifest_handlers/service_handler.h>
+#include <wgt_manifest_handlers/setting_handler.h>
+#include <wgt_manifest_handlers/splash_screen_handler.h>
+#include <wgt_manifest_handlers/tizen_application_handler.h>
+#include <wgt_manifest_handlers/warp_handler.h>
+#include <wgt_manifest_handlers/widget_handler.h>
 
 #include <memory>
 #include <string>
index 7cdae87..9cbb6eb 100644 (file)
@@ -50,7 +50,7 @@
           'uuid',
           'libwebappenc',
           'manifest-parser',
-          'manifest-handlers',
+          'wgt-manifest-handlers',
           'pkgmgr-info',
           'glib-2.0',
         ],
index d80c4fc..707fe28 100644 (file)
@@ -50,7 +50,7 @@ BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(libwebappenc)
-BuildRequires: pkgconfig(manifest-handlers)
+BuildRequires: pkgconfig(wgt-manifest-handlers)
 BuildRequires: pkgconfig(manifest-parser)
 BuildRequires: pkgconfig(notification)
 BuildRequires: pkgconfig(pkgmgr-info)
index 8bc89f8..fd7a8b0 100644 (file)
@@ -28,8 +28,8 @@
 #include <Evas_Legacy.h>
 
 #include "common/logger.h"
-#include "manifest_handlers/splash_screen_handler.h"
 #include "runtime/browser/native_window.h"
+#include "wgt_manifest_handlers/splash_screen_handler.h"
 
 using ScreenOrientation = runtime::NativeWindow::ScreenOrientation;
 
index 90fa986..90fc979 100644 (file)
@@ -25,8 +25,8 @@
 
 #include <Elementary.h>
 
-#include "manifest_handlers/splash_screen_handler.h"
 #include "runtime/browser/native_window.h"
+#include "wgt_manifest_handlers/splash_screen_handler.h"
 
 namespace runtime {
 
index 9c64060..007159b 100644 (file)
@@ -50,7 +50,7 @@
           'elementary',
           'deviced',
           'manifest-parser',
-          'manifest-handlers',
+          'wgt-manifest-handlers',
           'notification',
         ],
       },