diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 20:22:11 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 20:22:11 +0000 |
| commit | 6bacded203f81ca8645b35c2d20eb6b0e8781f76 (patch) | |
| tree | a29897866bf76b3aacafd26a509b431eb01719ed | |
| parent | 75a1cc43a2a9e360230ff1597ef16538f328e40b (diff) | |
| download | chromium_src-6bacded203f81ca8645b35c2d20eb6b0e8781f76.zip chromium_src-6bacded203f81ca8645b35c2d20eb6b0e8781f76.tar.gz chromium_src-6bacded203f81ca8645b35c2d20eb6b0e8781f76.tar.bz2 | |
OS X Breakpad cleanup.
* Compile OS X dump_syms & symupload utilities from the public repository to simplify the branded builder.
* Correct comment in breakpad_mac_stubs.mm so it more accurately reflects reality.
Review URL: http://codereview.chromium.org/113114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15574 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | breakpad/breakpad.gyp | 38 | ||||
| -rw-r--r-- | chrome/app/breakpad_mac_stubs.mm | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 |
3 files changed, 41 insertions, 1 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index ac70ca9e..e661ff7 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -89,6 +89,44 @@ } }, { + 'target_name': 'dump_syms', + 'type': 'executable', + 'include_dirs': [ + 'src/common/mac', + ], + 'dependencies': [ + 'breakpad_utilities', + ], + 'sources': [ + 'src/common/mac/dwarf/bytereader.cc', + 'src/common/mac/dwarf/dwarf2reader.cc', + 'src/common/mac/dwarf/functioninfo.cc', + 'src/common/mac/dump_syms.mm', + 'src/tools/mac/dump_syms/dump_syms_tool.mm', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + ], + } + }, + { + 'target_name': 'symupload', + 'type': 'executable', + 'include_dirs': [ + 'src/common/mac', + ], + 'sources': [ + 'src/common/mac/HTTPMultipartUpload.m', + 'src/tools/mac/symupload/symupload.m', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + ], + } + }, + { 'target_name': 'breakpad', 'type': '<(library)', 'dependencies': [ diff --git a/chrome/app/breakpad_mac_stubs.mm b/chrome/app/breakpad_mac_stubs.mm index 8497f4f..d70fce6 100644 --- a/chrome/app/breakpad_mac_stubs.mm +++ b/chrome/app/breakpad_mac_stubs.mm @@ -5,7 +5,7 @@ #import "chrome/app/breakpad_mac.h" // Stubbed out versions of breakpad integration functions so we can compile -// without linking in Breakpad on non-official builds. +// unit tests without linking in Breakpad. bool IsCrashReporterEnabled() { return false; diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index f876c47..1bf6af6 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2774,6 +2774,8 @@ 'type': 'none', 'dependencies': [ 'app', + '../breakpad/breakpad.gyp:dump_syms', + '../breakpad/breakpad.gyp:symupload', ], 'actions': [ { |