diff options
| author | benrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 22:20:23 +0000 |
|---|---|---|
| committer | benrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 22:20:23 +0000 |
| commit | 2a2813351eb4d5a4a5153c05340ddd04067cb297 (patch) | |
| tree | 4cd2d405ff5d664e4cd15b047fe9372e24379181 /webkit | |
| parent | ea4c3a94b41448c1173bc2b264efdd386d39282b (diff) | |
| download | chromium_src-2a2813351eb4d5a4a5153c05340ddd04067cb297.zip chromium_src-2a2813351eb4d5a4a5153c05340ddd04067cb297.tar.gz chromium_src-2a2813351eb4d5a4a5153c05340ddd04067cb297.tar.bz2 | |
This CL moves the contents of ui_resources_standard.grd into ui_resources.grd and theme_resources_standard.grd into theme_resources.grd. This also eliminates the following Grit outputs:
ui_resources.pak ==> duplicated in each scaled-resource pak
ui_resources_standard.h ==> merged into ui_resources.h
ui_resources_standard_map.h ==> renamed to ui_resources_map.h
ui_resources_standard_map.cc ==> renamed to ui_resources_map.cc
theme_resources.rc ==> merged into theme_resources_standard.rc
theme_resources.pak ==> duplicated in each scaled-resource pak
theme_resources_standard.h ==> merged into theme_resources.h
theme_resources_standard_map.h ==> merged into theme_resources_map.h
theme_resources_standard_map.cc ==> merged into theme_resources_map.cc
The image duplication is intentional; we may revisit this later.
Currently the standard-size images are included twice in the Windows build, once as an rc and once as a pak. I'll fix this in a followup CL.
TBR=ben@chromium.org,brettw@chromium.org,darin@chromium.org,stevenjb@chromium.org
BUG=133570
TEST=Trybots, local build
Review URL: https://chromiumcodereview.appspot.com/10756018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 1f05ce9..6f4d912 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -172,9 +172,9 @@ 'action_name': 'test_shell_repack', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', @@ -322,8 +322,8 @@ ], }, { # OS != "mac" 'dependencies': [ - '<(DEPTH)/ui/ui.gyp:ui_resources_standard', '<(DEPTH)/net/net.gyp:net_resources', + '<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', ] |