diff options
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 2 | ||||
| -rw-r--r-- | content/content_shell.gypi | 2 | ||||
| -rw-r--r-- | webkit/glue/resources/webkit_resources.grd | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi index 0cabac9..e977142 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -11,7 +11,7 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], 'conditions': [ ['enable_extensions==1', { diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 124ddb6..3099bc2 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -258,7 +258,7 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', ], }, diff --git a/webkit/glue/resources/webkit_resources.grd b/webkit/glue/resources/webkit_resources.grd index 9d26655..3edee8f 100644 --- a/webkit/glue/resources/webkit_resources.grd +++ b/webkit/glue/resources/webkit_resources.grd @@ -4,7 +4,9 @@ <output filename="grit/webkit_resources.h" type="rc_header" context="default_100_percent"> <emit emit_type='prepend'></emit> </output> + <!-- TODO, update third_party/webkit DumpRenderTree to use *_100_percent.pak, then delete old pak file. --> <output filename="webkit_resources.pak" type="data_package" context="default_100_percent" /> + <output filename="webkit_resources_100_percent.pak" type="data_package" context="default_100_percent" /> <output filename="webkit_resources_200_percent.pak" type="data_package" context="default_200_percent" /> <output filename="webkit_resources.rc" type="rc_all" context="default_100_percent" /> </outputs> diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index b1c17d7..37847e9 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -177,7 +177,7 @@ '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', ], }, @@ -298,7 +298,7 @@ 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], }, 'inputs': [ |