diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 23:28:53 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 23:28:53 +0000 |
| commit | 755e1b73a0b4894ecc36401fd042c744e7837844 (patch) | |
| tree | 63fe18c53ff1e42368c0a38f5c8a4475aaceb7fe /chrome/chrome.gyp | |
| parent | 25bacf3dd25367f130baa92895a0c01c3d1d7e13 (diff) | |
| download | chromium_src-755e1b73a0b4894ecc36401fd042c744e7837844.zip chromium_src-755e1b73a0b4894ecc36401fd042c744e7837844.tar.gz chromium_src-755e1b73a0b4894ecc36401fd042c744e7837844.tar.bz2 | |
Reapply "Move the files in resources/shared/ into resources.pak"
Now with one line fix to fix the mac build.
BUG=35793,42770
TEST=none
TBR=tony
Review URL: http://codereview.chromium.org/2842025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50783 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 3505c4d..0a59914 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -61,6 +61,7 @@ # it easier for us to reference them internally. 'browser/resources/bookmark_manager_resources.grd', 'browser/resources/net_internals_resources.grd', + 'browser/resources/shared_resources.grd' ], 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], 'grit_cmd': ['python', '../tools/grit/grit.py'], @@ -1510,6 +1511,7 @@ 'pak_inputs': [ '<(grit_out_dir)/bookmark_manager_resources.pak', '<(grit_out_dir)/net_internals_resources.pak', + '<(grit_out_dir)/shared_resources.pak', ], }, 'inputs': [ |