diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 19:39:20 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 19:39:20 +0000 |
| commit | 33a4aca7c65ed0bb2636615ef5e5c83cf50ff6a0 (patch) | |
| tree | 9375a2fb5a8d1e43230367349f4e60614dc10e6c | |
| parent | ffec63a1e667bb668ddc922acd7437576a1c8262 (diff) | |
| download | chromium_src-33a4aca7c65ed0bb2636615ef5e5c83cf50ff6a0.zip chromium_src-33a4aca7c65ed0bb2636615ef5e5c83cf50ff6a0.tar.gz chromium_src-33a4aca7c65ed0bb2636615ef5e5c83cf50ff6a0.tar.bz2 | |
Convert test_shell_resources to use build/grit_action.gypi.
TEST=test_shell still builds
Review URL: http://codereview.chromium.org/7453059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95137 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 9a724e5..993d489 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -702,33 +702,17 @@ { 'target_name': 'test_shell_resources', 'type': 'none', + 'variables': { + 'grit_grd_file': './test_shell_resources.grd', + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/test_shell', + }, 'actions': [ { 'action_name': 'test_shell_resources', - 'variables': { - 'grit_path': '../../../tools/grit/grit.py', - 'input_path': './test_shell_resources.grd', - 'out_dir': '<(SHARED_INTERMEDIATE_DIR)/test_shell', - }, - 'inputs': [ - '<(input_path)', - ], - 'outputs': [ - '<(out_dir)/grit/test_shell_resources.h', - '<(out_dir)/test_shell_resources.pak', - ], - 'action': ['python', '<(grit_path)', - '-i', '<(input_path)', - 'build', '-o', '<(out_dir)', - '<@(grit_defines)'], - 'message': 'Generating resources from <(input_path)', + 'includes': [ '../../../build/grit_action.gypi' ], }, ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/test_shell', - ], - }, + 'includes': [ '../../../build/grit_target.gypi' ], }, ], }], |