diff options
| author | adriansc@chromium.org <adriansc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-09 21:31:17 +0000 |
|---|---|---|
| committer | adriansc@chromium.org <adriansc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-09 21:31:17 +0000 |
| commit | 2aefa3ab2bbaae42aea7033041aa8be497472db3 (patch) | |
| tree | f5d87fdc50e1b5406d2324c3b8ff5cebd2651854 /webkit | |
| parent | 61368ee58063da1893f10beae41a3be5320a8274 (diff) | |
| download | chromium_src-2aefa3ab2bbaae42aea7033041aa8be497472db3.zip chromium_src-2aefa3ab2bbaae42aea7033041aa8be497472db3.tar.gz chromium_src-2aefa3ab2bbaae42aea7033041aa8be497472db3.tar.bz2 | |
Merged duplicate functions from tools/data_pack into the grit/format/data_pack class.
Marked tools/data_pack directory for removal when the dependency in third_party file WebKit.gyp has been updated to point to grit.
BUG=none
TEST=builds
Review URL: http://codereview.chromium.org/7795057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100504 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 e241f44..01506fc 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -156,7 +156,7 @@ 'target_name': 'test_shell_pak', 'type': 'none', 'variables': { - 'repack_path': '../../../tools/data_pack/repack.py', + 'repack_path': '../../../tools/grit/grit/format/repack.py', 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak', }, 'conditions': [ @@ -284,7 +284,7 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], 'variables': { - 'repack_path': '../../../tools/data_pack/repack.py', + 'repack_path': '../../../tools/grit/grit/format/repack.py', }, 'actions': [ { |