diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-01 18:54:57 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-01 18:54:57 +0000 |
| commit | 4c9cc6c9d2c3c801088337f56e7270459beb3289 (patch) | |
| tree | 834f8063a2e45d8b626f6630fc1078a3bd0ff5e1 /chrome | |
| parent | 0dd5dda0318cfbe06bc73f4a24a5e6b6b8e3fc30 (diff) | |
| download | chromium_src-4c9cc6c9d2c3c801088337f56e7270459beb3289.zip chromium_src-4c9cc6c9d2c3c801088337f56e7270459beb3289.tar.gz chromium_src-4c9cc6c9d2c3c801088337f56e7270459beb3289.tar.bz2 | |
Remove a circular dependency for chrome Linux symbols. Make it possible to force Linux symbol dumping.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/243056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rwxr-xr-x | chrome/chrome.gyp | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index d5c9b15..84fa030 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3328,34 +3328,6 @@ 'message': 'Generating manpage' }, ], - - 'conditions': [ - # All Chrome builds have breakpad symbols, but only process the - # symbols from official builds. - # TODO(mmoss) dump_syms segfaults on x64. Enable once dump_syms and - # crash server handle 64-bit symbols. - ['branding=="Chrome" and buildtype=="Official" and' - ' target_arch=="ia32"', { - 'actions': [ - { - 'action_name': 'dump_symbols', - 'inputs': [ - '<(DEPTH)/build/linux/dump_app_syms', - '<(DEPTH)/build/linux/dump_signature.py', - '<(PRODUCT_DIR)/dump_syms', - '<(PRODUCT_DIR)/chrome', - ], - 'outputs': [ - '<(PRODUCT_DIR)/chrome.breakpad.<(target_arch)', - ], - 'action': ['<(DEPTH)/build/linux/dump_app_syms', - '<(PRODUCT_DIR)/dump_syms', - '<(PRODUCT_DIR)/chrome', '<@(_outputs)'], - 'message': 'Dumping breakpad symbols to <(_outputs)' - }, - ], - }], - ], 'dependencies': [ # On Linux, link the dependencies (libraries) that make up actual # Chromium functionality directly into the executable. @@ -5637,6 +5609,36 @@ 'test/reliability/page_load_test.h', ], }, + { + 'target_name': 'linux_symbols', + 'type': 'none', + 'conditions': [ + ['linux_dump_symbols==1', { + 'actions': [ + { + 'action_name': 'dump_symbols', + 'inputs': [ + '<(DEPTH)/build/linux/dump_app_syms', + '<(DEPTH)/build/linux/dump_signature.py', + '<(PRODUCT_DIR)/dump_syms', + '<(PRODUCT_DIR)/chrome', + ], + 'outputs': [ + '<(PRODUCT_DIR)/chrome.breakpad.<(target_arch)', + ], + 'action': ['<(DEPTH)/build/linux/dump_app_syms', + '<(PRODUCT_DIR)/dump_syms', + '<(PRODUCT_DIR)/chrome', '<@(_outputs)'], + 'message': 'Dumping breakpad symbols to <(_outputs)' + }, + ], + 'dependencies': [ + 'chrome', + '../breakpad/breakpad.gyp:dump_syms', + ], + }], + ], + } ], },], # OS=="linux" ['OS!="win"', |