Upstream version 8.36.171.0

[platform/framework/web/crosswalk.git] / src / xwalk / xwalk.gyp

diff --git a/src/xwalk/xwalk.gyp b/src/xwalk/xwalk.gyp
index aadd4f4..7b691ae 100644 (file)
--- a/src/xwalk/xwalk.gyp
+++ b/src/xwalk/xwalk.gyp
@@ -205,8 +205,8 @@
         'runtime/browser/ui/native_app_window_tizen.h',
         'runtime/browser/ui/native_app_window_views.cc',
         'runtime/browser/ui/native_app_window_views.h',
-        'runtime/browser/ui/splash_screen.cc',
-        'runtime/browser/ui/splash_screen.h',
+        'runtime/browser/ui/splash_screen_tizen.cc',
+        'runtime/browser/ui/splash_screen_tizen.h',
         'runtime/browser/ui/taskbar_util.h',
         'runtime/browser/ui/taskbar_util_win.cc',
         'runtime/browser/ui/top_view_layout_views.cc',
@@ -296,6 +296,7 @@
       'conditions': [
         ['tizen==1', {
           'dependencies': [
+            '../content/content_resources.gyp:content_resources',
             'build/system.gyp:tizen_geolocation',
             'sysapps/sysapps_resources.gyp:xwalk_sysapps_resources',
             'tizen/xwalk_tizen.gypi:xwalk_tizen_lib',
@@ -514,6 +515,15 @@
                 ],
               },
             }],
+            [ 'tizen==1', {
+              'variables': {
+                'pak_inputs+': [
+                  # Add WebUI resources for Tizen.
+                  '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
+                ],
+              },
+            }],
           ],
           'inputs': [
             '<(repack_path)',