diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 20:07:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 20:07:17 +0000 |
| commit | af19338e9e281cb36b94c198a95d1e9a760e767b (patch) | |
| tree | 3d74d34c43a63208fe47c607db8c618bf36462cf /chrome/chrome.gyp | |
| parent | 109fc45253e5601dce3fdc35fea2ac1bed08a9b0 (diff) | |
| download | chromium_src-af19338e9e281cb36b94c198a95d1e9a760e767b.zip chromium_src-af19338e9e281cb36b94c198a95d1e9a760e767b.tar.gz chromium_src-af19338e9e281cb36b94c198a95d1e9a760e767b.tar.bz2 | |
Load net-internals resources from resources.pak.
This is the same as r50257 with 2 fixes:
1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will
work for things tests.
2) Add back the check in chrome_paths.cc to see if we're in a
mac bundle or not.
BUG=35793,42770
TEST=none
Review URL: http://codereview.chromium.org/2865010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 671e9cf..354dc10 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -448,6 +448,8 @@ 'outputs': [ '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h', '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak', + '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT)_map.cc', + '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT)_map.h', # TODO(bradnelson): move to something like this instead #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_resources_grds))', # This currently cannot work because gyp only evaluates the |