diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 02:23:35 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 02:23:35 +0000 |
| commit | 0b5939222f9d18f407c2e28b916dcf5adc63640c (patch) | |
| tree | fe855f569d80a173a0476684c5faef804e29e62d /chrome_frame/chrome_frame.gyp | |
| parent | 77af27c72a5d83b6d6b69e67234c87428a6e8499 (diff) | |
| download | chromium_src-0b5939222f9d18f407c2e28b916dcf5adc63640c.zip chromium_src-0b5939222f9d18f407c2e28b916dcf5adc63640c.tar.gz chromium_src-0b5939222f9d18f407c2e28b916dcf5adc63640c.tar.bz2 | |
Undo removal of chrome_dll_version from r67457.
This is not a straight revert as we keep the part where chrome.dll
directly includes the generated .rc file instead of having it included
via chrome_dll.rc, as that seems to cause other dependency issues.
BUG=none
TEST=it builds, incremental builds on changes to chrome/VERSION work.
Review URL: http://codereview.chromium.org/5259007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index f141e09..6fc4d6d 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -498,7 +498,7 @@ '../breakpad/breakpad.gyp:breakpad_handler', '../chrome/chrome.gyp:automation', '../chrome/chrome.gyp:crash_service', - '../chrome/chrome.gyp:chrome_version_header', + '../chrome/chrome.gyp:chrome_dll_version', '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', ], @@ -869,7 +869,7 @@ 'chrome_frame_launcher.gyp:chrome_frame_helper_dll', '../chrome/chrome.gyp:chrome', '../chrome/chrome.gyp:chrome_dll', - '../chrome/chrome.gyp:chrome_version_header', + '../chrome/chrome.gyp:chrome_dll_version', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', ], |