diff options
| author | mark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-25 06:42:45 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-25 06:42:45 +0000 |
| commit | e3612499c72bdc4a743666de94fa95301625d0e2 (patch) | |
| tree | 156625c3ea5ecd322ef84eaee70be30634511acf /samples | |
| parent | 0af45e0854ad7ff549280d7b340f71bdf4a25290 (diff) | |
| download | gyp-e3612499c72bdc4a743666de94fa95301625d0e2.tar.gz | |
Fix grit invocation after Chromium r10306. grit now puts its generated
headers in a grit directory on its own and does not need to be told to use
a grit directory. The grit rule and action in net.gyp may need to be
modified as well.
git-svn-id: http://gyp.googlecode.com/svn/trunk@307 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/chrome.gyp | 2 | ||||
| -rw-r--r-- | samples/webkit.gyp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/samples/chrome.gyp b/samples/chrome.gyp index 4d235f61..164ccbd8 100644 --- a/samples/chrome.gyp +++ b/samples/chrome.gyp @@ -46,7 +46,7 @@ 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h', ], - 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome/grit'], + 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome'], }, ], 'sources': [ diff --git a/samples/webkit.gyp b/samples/webkit.gyp index c6524271..3ff3617f 100644 --- a/samples/webkit.gyp +++ b/samples/webkit.gyp @@ -4029,7 +4029,6 @@ ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', - '<(SHARED_INTERMEDIATE_DIR)/webkit', ], 'sources': [ # webkit_version rule @@ -4226,11 +4225,6 @@ # Dependents may rely on files generated by this target or one of its # own hard dependencies. 'hard_dependency': 1, - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit/grit', - ], - }, 'export_dependent_settings': [ 'webcore', ], |