diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 22:12:39 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 22:12:39 +0000 |
| commit | 26c2b23471dafa0db5254e28907e3741b98ac3ed (patch) | |
| tree | 805b9575d20911ef40791e48910700584afdd847 /chrome/chrome_dll.gypi | |
| parent | 7b1bf816970d76ef2a062f3bd1e235e7e584746b (diff) | |
| download | chromium_src-26c2b23471dafa0db5254e28907e3741b98ac3ed.zip chromium_src-26c2b23471dafa0db5254e28907e3741b98ac3ed.tar.gz chromium_src-26c2b23471dafa0db5254e28907e3741b98ac3ed.tar.bz2 | |
Speculatively revert 50374 (miniinstaller breakage) - Load netinternals 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
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2799022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index eced91f..71863b1e 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -445,6 +445,7 @@ '<(PRODUCT_DIR)/resources/gmail_app/', '<(PRODUCT_DIR)/resources/calendar_app/', '<(PRODUCT_DIR)/resources/docs_app/', + '<(PRODUCT_DIR)/resources/net_internals/' ], 'conditions': [ ['mac_breakpad==1', { @@ -481,12 +482,6 @@ }], ], }, - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(INTERMEDIATE_DIR)/repack/resources.pak' - ], - }, ], 'conditions': [ ['mac_breakpad==1', { |