diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 19:38:34 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 19:38:34 +0000 |
| commit | ea0269b4343fa25cc5d8f72c8542ea14185354d6 (patch) | |
| tree | a4e3d618fc384b84ac53a610ed9a8126bc8fb9ee | |
| parent | a061930d98fa1697717da3c8484b14e420509128 (diff) | |
| download | chromium_src-ea0269b4343fa25cc5d8f72c8542ea14185354d6.zip chromium_src-ea0269b4343fa25cc5d8f72c8542ea14185354d6.tar.gz chromium_src-ea0269b4343fa25cc5d8f72c8542ea14185354d6.tar.bz2 | |
Fix breakpad-related Linux official build breakage.
Move the "breakpad_linux*" files to the "browser" target rather than "app",
since they're needed by "render_crash_handler_host_linux*" which is in
"browser". This fixes link errors in unit_tests, which incorporates "browser"
but wasn't getting the definitions in these files.
This is a revised version of r16954 which avoids the scons "multiple inclusion" errors in the non-official build.
Review URL: http://codereview.chromium.org/115823
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17011 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 5130aaf..5c95528 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1569,10 +1569,21 @@ ['linux_breakpad==1', { 'sources': [ 'browser/renderer_host/render_crash_handler_host_linux.cc', + 'app/breakpad_linux.cc', + 'app/breakpad_linux.h', + ], + 'dependencies': [ + '../breakpad/breakpad.gyp:breakpad_client', + ], + 'include_dirs': [ + # breakpad_linux.cc wants file_version_info_linux.h + '<(SHARED_INTERMEDIATE_DIR)', ], }, { 'sources': [ 'browser/renderer_host/render_crash_handler_host_linux_stub.cc', + 'app/breakpad_linux_stub.cc', + 'app/breakpad_linux.h', ], }], ], @@ -2103,27 +2114,6 @@ 'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'], }, ], - 'include_dirs': [ - # Needed in order to be able to read the raw - # file_version_info_linux.h file. - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'conditions': [ - ['linux_breakpad==1', { - 'sources': [ - 'app/breakpad_linux.cc', - 'app/breakpad_linux.h', - ], - 'dependencies': [ - '../breakpad/breakpad.gyp:breakpad_client', - ], - }, { - 'sources': [ - 'app/breakpad_linux_stub.cc', - 'app/breakpad_linux.h', - ], - }], - ] }], ['OS=="linux" and toolkit_views==1', { 'dependencies': [ |