From 1a8b44dc53d4eff35cb2a203e5ec7709c635e02b Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Tue, 20 Jul 2010 14:58:12 +0000 Subject: Update breakpad.gyp for Mac compatibility with Breakpad r627 as used by Chromium r52958. BUG=none TEST=official build Review URL: http://codereview.chromium.org/3008012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53041 0039d316-1c4b-4281-b951-d872f2087c98 --- breakpad/breakpad.gyp | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'breakpad/breakpad.gyp') diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 82fb4e1..1dfae53 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -50,6 +50,9 @@ 'dependencies': [ 'breakpad_utilities', ], + 'include_dirs': [ + 'src/common/mac', + ], 'sources': [ 'src/client/mac/crash_generation/Inspector.mm', 'src/client/mac/crash_generation/InspectorMain.mm', @@ -64,6 +67,9 @@ 'target_name': 'crash_report_sender', 'type': 'executable', 'mac_bundle': 1, + 'include_dirs': [ + 'src/common/mac', + ], 'sources': [ 'src/common/mac/HTTPMultipartUpload.m', 'src/client/mac/sender/crash_report_sender.m', @@ -95,16 +101,29 @@ 'include_dirs': [ 'src/common/mac', ], - 'dependencies': [ - 'breakpad_utilities', - ], 'sources': [ - 'src/common/dwarf/bytereader.cc', + 'src/common/dwarf/dwarf2diehandler.cc', 'src/common/dwarf/dwarf2reader.cc', - 'src/common/dwarf/functioninfo.cc', + 'src/common/dwarf/bytereader.cc', + 'src/common/dwarf_cfi_to_module.cc', + 'src/common/dwarf_cu_to_module.cc', + 'src/common/dwarf_line_to_module.cc', + 'src/common/language.cc', + 'src/common/module.cc', 'src/common/mac/dump_syms.mm', + 'src/common/mac/file_id.cc', + 'src/common/mac/macho_id.cc', + 'src/common/mac/macho_reader.cc', + 'src/common/mac/macho_utilities.cc', + 'src/common/mac/macho_walker.cc', + 'src/common/stabs_reader.cc', + 'src/common/stabs_to_module.cc', 'src/tools/mac/dump_syms/dump_syms_tool.mm', ], + 'defines': [ + # For src/common/stabs_reader.h. + 'HAVE_MACH_O_NLIST_H', + ], 'xcode_settings': { # The DWARF utilities require -funsigned-char. 'GCC_CHAR_IS_UNSIGNED_CHAR': 'YES', @@ -114,6 +133,7 @@ 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/usr/lib/libcrypto.dylib', ], }, 'configurations': { -- cgit v1.1