diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 13:32:22 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 13:32:22 +0000 |
| commit | ef36c74c2e00d7559fd30eda9b7264e2777bb5fe (patch) | |
| tree | 3b72bcd66671ffd030e013db852d5162e531eb34 /webkit/tools/test_shell | |
| parent | 03066d1ea3e15d710f2ee87b18b790567498cdd7 (diff) | |
| download | chromium_src-ef36c74c2e00d7559fd30eda9b7264e2777bb5fe.zip chromium_src-ef36c74c2e00d7559fd30eda9b7264e2777bb5fe.tar.gz chromium_src-ef36c74c2e00d7559fd30eda9b7264e2777bb5fe.tar.bz2 | |
net_resources unfork
- bring the rules for grit all in align for common style/dir names.
- make the mac build net:net_resource (was win/linux only)
- ripple the mac dep upstream
- merge net_resource into the chrome repack
more work is needed on the mac side, we aren't really using the new resources
yet, but this is a clean landing point.
Review URL: http://codereview.chromium.org/45001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 7d68297..a9ac5aa 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -167,8 +167,8 @@ { 'action_name': 'test_shell_repack', 'inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/test_shell_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', ], @@ -300,16 +300,16 @@ '../../../tools/grit/grit.py', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/grit/<(RULE_INPUT_ROOT).h', - '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/<(RULE_INPUT_ROOT).pak', + '<(SHARED_INTERMEDIATE_DIR)/test_shell/grit/<(RULE_INPUT_ROOT).h', + '<(SHARED_INTERMEDIATE_DIR)/test_shell/<(RULE_INPUT_ROOT).pak', ], 'action': - ['python', '../tools/grit/grit.py', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources'], + ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/test_shell'], }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources', + '<(SHARED_INTERMEDIATE_DIR)/test_shell', ], }, }, |