From 365cd36b19993b5fde12e0d7894f06a45008d3df Mon Sep 17 00:00:00 2001 From: "gregoryd@google.com" Date: Sat, 5 Dec 2009 21:01:46 +0000 Subject: Split breakpad.gyp and add two new Win64-specific targets. This is required for supporting NaCl on 64-bit Windows. breakpad_handler and breakpad_sender targets now have 32-bit and 64-bit versions. Review URL: http://codereview.chromium.org/464027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33931 0039d316-1c4b-4281-b951-d872f2087c98 --- breakpad/breakpad.gyp | 70 +++------------------------------------------------ 1 file changed, 4 insertions(+), 66 deletions(-) (limited to 'breakpad/breakpad.gyp') diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 74ed1f1..ab5b98d 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -3,6 +3,10 @@ # found in the LICENSE file. { + 'includes': [ + 'breakpad_sender.gypi', + 'breakpad_handler.gypi', + ], 'conditions': [ [ 'OS=="mac"', { 'target_defaults': { @@ -155,72 +159,6 @@ }, ], }], - [ 'OS=="win"', { - 'targets': [ - { - 'target_name': 'breakpad_handler', - 'type': '<(library)', - 'msvs_guid': 'B55CA863-B374-4BAF-95AC-539E4FA4C90C', - 'sources': [ - 'src/client/windows/crash_generation/client_info.cc', - 'src/client/windows/crash_generation/client_info.h', - 'src/client/windows/crash_generation/crash_generation_client.cc', - 'src/client/windows/crash_generation/crash_generation_client.h', - 'src/client/windows/crash_generation/crash_generation_server.cc', - 'src/client/windows/crash_generation/crash_generation_server.h', - 'src/client/windows/handler/exception_handler.cc', - 'src/client/windows/handler/exception_handler.h', - 'src/common/windows/guid_string.cc', - 'src/common/windows/guid_string.h', - 'src/google_breakpad/common/minidump_format.h', - 'src/client/windows/crash_generation/minidump_generator.cc', - 'src/client/windows/crash_generation/minidump_generator.h', - 'src/common/windows/string_utils-inl.h', - ], - 'include_dirs': [ - 'src', - ], - 'link_settings': { - 'libraries': [ - '-lurlmon.lib', - ], - }, - 'defines': [ - # Avoid the TerminateThread Application Verifier Failure. - 'BREAKPAD_NO_TERMINATE_THREAD', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'src', - ], - }, - }, - { - 'target_name': 'breakpad_sender', - 'type': '<(library)', - 'msvs_guid': '9946A048-043B-4F8F-9E07-9297B204714C', - 'sources': [ - 'src/client/windows/sender/crash_report_sender.cc', - 'src/common/windows/http_upload.cc', - 'src/client/windows/sender/crash_report_sender.h', - 'src/common/windows/http_upload.h', - ], - 'include_dirs': [ - 'src', - ], - 'link_settings': { - 'libraries': [ - '-lurlmon.lib', - ], - }, - 'direct_dependent_settings': { - 'include_dirs': [ - 'src', - ], - }, - }, - ], - }], [ 'OS=="linux"', { 'conditions': [ # Tools needed for archiving build symbols. -- cgit v1.1