X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fxwalk%2Fxwalk.gyp;h=75455496b6f1ac750b204b31463fd61dd96b66c2;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=ad39b50d522123aa89a5ed453b7fa52590e3b717;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/xwalk/xwalk.gyp b/src/xwalk/xwalk.gyp index ad39b50..75455496 100644 --- a/src/xwalk/xwalk.gyp +++ b/src/xwalk/xwalk.gyp @@ -43,7 +43,6 @@ '../content/content.gyp:content_ppapi_plugin', '../content/content.gyp:content_renderer', '../content/content.gyp:content_utility', - '../content/content.gyp:content_worker', '../ipc/ipc.gyp:ipc', '../media/media.gyp:media', '../net/net.gyp:net', @@ -59,7 +58,7 @@ '../webkit/common/webkit_common.gyp:webkit_common', '../webkit/storage_browser.gyp:webkit_storage_browser', '../webkit/storage_common.gyp:webkit_storage_common', - '../webkit/webkit_resources.gyp:webkit_resources', + '../webkit/glue/resources/webkit_resources.gyp:webkit_resources', 'xwalk_application_lib', 'xwalk_resources', 'extensions/extensions.gyp:xwalk_extensions', @@ -493,13 +492,13 @@ '<(SHARED_INTERMEDIATE_DIR)/xwalk/xwalk_extensions_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/xwalk/xwalk_sysapps_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak', ], }, 'conditions': [ @@ -522,7 +521,7 @@ 'pak_inputs+': [ # Add WebUI resources for Tizen. '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', ], }, }],