diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 02:03:47 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 02:03:47 +0000 |
| commit | 2cc098e42e7b46513687c210de4bacbae4009ec3 (patch) | |
| tree | 4a3e26216656218e428880bd6f28d1ab8f9eae18 /webkit/tools/test_shell/test_shell.gypi | |
| parent | 19efc6bed985bff75f74652ea0583503809f66ff (diff) | |
| download | chromium_src-2cc098e42e7b46513687c210de4bacbae4009ec3.zip chromium_src-2cc098e42e7b46513687c210de4bacbae4009ec3.tar.gz chromium_src-2cc098e42e7b46513687c210de4bacbae4009ec3.tar.bz2 | |
Move devtool resources from webkit_resources.grd to an upstream grd file.
This gets rid of third_party references in webkit_resources.grd which will allow us to build this file upstream.
Review URL: http://codereview.chromium.org/792005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.gypi')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index a1bd3cb..ef02fb3 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -201,6 +201,7 @@ 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.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', ], @@ -277,6 +278,7 @@ # but that causes errors in other targets when # resulting .res files get referenced multiple times. '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', ], @@ -310,6 +312,7 @@ 'action_name': 'repack_locale', 'variables': { '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', ], |