diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-16 03:10:07 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-16 03:10:07 +0000 |
| commit | 9742508529581c44056a836d10fa6cfd76ecca7b (patch) | |
| tree | 6097ddf43758a19f18edf4c02b55d89616c90310 /breakpad | |
| parent | 6df6ec02bbb09f5c81e4bf9189bd7237eb2c4e1f (diff) | |
| download | chromium_src-9742508529581c44056a836d10fa6cfd76ecca7b.zip chromium_src-9742508529581c44056a836d10fa6cfd76ecca7b.tar.gz chromium_src-9742508529581c44056a836d10fa6cfd76ecca7b.tar.bz2 | |
Remove USE_LINUX_BREAKPAD ifdef since we don't need it for chromium anymore.
See thread "[chromium-dev] PSA: Breakpad is now compiled into
Chromium by default on Linux' for background
TBR=sbc@chromium.org, thakis@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/18770006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'breakpad')
| -rw-r--r-- | breakpad/breakpad.gyp | 160 |
1 files changed, 78 insertions, 82 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 66c590a..40151c1 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -339,95 +339,91 @@ '__ANDROID__', ], }], - # Tools needed for archiving build symbols. - ['linux_breakpad==1', { - 'targets': [ - { - 'target_name': 'symupload', - 'type': 'executable', + ], + # Tools needed for archiving build symbols. + 'targets': [ + { + 'target_name': 'symupload', + 'type': 'executable', - 'includes': ['breakpad_tools.gypi'], + 'includes': ['breakpad_tools.gypi'], - 'sources': [ - 'src/tools/linux/symupload/sym_upload.cc', - 'src/common/linux/http_upload.cc', - 'src/common/linux/http_upload.h', - ], - 'include_dirs': [ - 'src', - 'src/third_party', - ], - 'link_settings': { - 'libraries': [ - '-ldl', - ], - }, - }, - { - 'target_name': 'dump_syms', - 'type': 'executable', - 'conditions': [ - ['OS=="android"', { - 'toolsets': [ 'host' ], - }], - ], + 'sources': [ + 'src/tools/linux/symupload/sym_upload.cc', + 'src/common/linux/http_upload.cc', + 'src/common/linux/http_upload.h', + ], + 'include_dirs': [ + 'src', + 'src/third_party', + ], + 'link_settings': { + 'libraries': [ + '-ldl', + ], + }, + }, + { + 'target_name': 'dump_syms', + 'type': 'executable', + 'conditions': [ + ['OS=="android"', { + 'toolsets': [ 'host' ], + }], + ], - # dwarf2reader.cc uses dynamic_cast. Because we don't typically - # don't support RTTI, we enable it for this single target. Since - # dump_syms doesn't share any object files with anything else, - # this doesn't end up polluting Chrome itself. - 'cflags_cc!': ['-fno-rtti'], + # dwarf2reader.cc uses dynamic_cast. Because we don't typically + # don't support RTTI, we enable it for this single target. Since + # dump_syms doesn't share any object files with anything else, + # this doesn't end up polluting Chrome itself. + 'cflags_cc!': ['-fno-rtti'], - 'sources': [ - 'src/common/dwarf/bytereader.cc', - 'src/common/dwarf_cfi_to_module.cc', - 'src/common/dwarf_cfi_to_module.h', - 'src/common/dwarf_cu_to_module.cc', - 'src/common/dwarf_cu_to_module.h', - 'src/common/dwarf/dwarf2diehandler.cc', - 'src/common/dwarf/dwarf2reader.cc', - 'src/common/dwarf_line_to_module.cc', - 'src/common/dwarf_line_to_module.h', - 'src/common/language.cc', - 'src/common/language.h', - 'src/common/linux/dump_symbols.cc', - 'src/common/linux/dump_symbols.h', - 'src/common/linux/elf_symbols_to_module.cc', - 'src/common/linux/elf_symbols_to_module.h', - 'src/common/linux/elfutils.cc', - 'src/common/linux/elfutils.h', - 'src/common/linux/file_id.cc', - 'src/common/linux/file_id.h', - 'src/common/linux/linux_libc_support.cc', - 'src/common/linux/linux_libc_support.h', - 'src/common/linux/memory_mapped_file.cc', - 'src/common/linux/memory_mapped_file.h', - 'src/common/linux/guid_creator.h', - 'src/common/module.cc', - 'src/common/module.h', - 'src/common/stabs_reader.cc', - 'src/common/stabs_reader.h', - 'src/common/stabs_to_module.cc', - 'src/common/stabs_to_module.h', - 'src/tools/linux/dump_syms/dump_syms.cc', - ], + 'sources': [ + 'src/common/dwarf/bytereader.cc', + 'src/common/dwarf_cfi_to_module.cc', + 'src/common/dwarf_cfi_to_module.h', + 'src/common/dwarf_cu_to_module.cc', + 'src/common/dwarf_cu_to_module.h', + 'src/common/dwarf/dwarf2diehandler.cc', + 'src/common/dwarf/dwarf2reader.cc', + 'src/common/dwarf_line_to_module.cc', + 'src/common/dwarf_line_to_module.h', + 'src/common/language.cc', + 'src/common/language.h', + 'src/common/linux/dump_symbols.cc', + 'src/common/linux/dump_symbols.h', + 'src/common/linux/elf_symbols_to_module.cc', + 'src/common/linux/elf_symbols_to_module.h', + 'src/common/linux/elfutils.cc', + 'src/common/linux/elfutils.h', + 'src/common/linux/file_id.cc', + 'src/common/linux/file_id.h', + 'src/common/linux/linux_libc_support.cc', + 'src/common/linux/linux_libc_support.h', + 'src/common/linux/memory_mapped_file.cc', + 'src/common/linux/memory_mapped_file.h', + 'src/common/linux/guid_creator.h', + 'src/common/module.cc', + 'src/common/module.h', + 'src/common/stabs_reader.cc', + 'src/common/stabs_reader.h', + 'src/common/stabs_to_module.cc', + 'src/common/stabs_to_module.h', + 'src/tools/linux/dump_syms/dump_syms.cc', + ], - # Breakpad rev 583 introduced this flag. - # Using this define, stabs_reader.h will include a.out.h to - # build on Linux. - 'defines': [ - 'HAVE_A_OUT_H', - ], + # Breakpad rev 583 introduced this flag. + # Using this define, stabs_reader.h will include a.out.h to + # build on Linux. + 'defines': [ + 'HAVE_A_OUT_H', + ], - 'include_dirs': [ - 'src', - '..', - ], - }, + 'include_dirs': [ + 'src', + '..', ], - }], - ], - 'targets': [ + }, { 'target_name': 'breakpad_client', 'type': 'static_library', |