diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 16:48:30 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 16:48:30 +0000 |
| commit | 94cf539833e4c68c2a2ceaf59443a6cdc0cc684d (patch) | |
| tree | d504fbaf90d0c0aa26d7d421dc8480a0e71449d3 /breakpad/breakpad_handler.gypi | |
| parent | 7ce414f08b9fc4a32427654bbeb79301428b181d (diff) | |
| download | chromium_src-94cf539833e4c68c2a2ceaf59443a6cdc0cc684d.zip chromium_src-94cf539833e4c68c2a2ceaf59443a6cdc0cc684d.tar.gz chromium_src-94cf539833e4c68c2a2ceaf59443a6cdc0cc684d.tar.bz2 | |
Create a new breakpad target that is built in a manner suitable for use in a DLL. Specifically, do NOT #define BREAKPAD_NO_TERMINATE_THREAD in this new target since that makes crash reporting shutdown racy and crash-prone.
BUG=68536
TEST=NONE
Review URL: http://codereview.chromium.org/6102001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'breakpad/breakpad_handler.gypi')
| -rw-r--r-- | breakpad/breakpad_handler.gypi | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/breakpad/breakpad_handler.gypi b/breakpad/breakpad_handler.gypi index af7eaea..5d20542 100644 --- a/breakpad/breakpad_handler.gypi +++ b/breakpad/breakpad_handler.gypi @@ -28,10 +28,6 @@ 'include_dirs': [ 'src', ], - 'defines': [ - # Avoid the TerminateThread Application Verifier Failure. - 'BREAKPAD_NO_TERMINATE_THREAD', - ], }], ], }, @@ -41,7 +37,28 @@ { 'target_name': 'breakpad_handler', 'type': '<(library)', - 'msvs_guid': 'B55CA863-B374-4BAF-95AC-539E4FA4C90C', + 'variables': { + 'breakpad_handler_target': 1, + }, + # TODO(gregoryd): direct_dependent_settings should be shared with the + # 64-bit target, but it doesn't work due to a bug in gyp + 'direct_dependent_settings': { + 'include_dirs': [ + 'src', + ], + }, + 'defines': [ + # Avoid the TerminateThread Application Verifier Failure. + 'BREAKPAD_NO_TERMINATE_THREAD', + ], + }, + { + # This alternate breakpad target builds a breakpad that is suitable + # for use with a DLL. It explicitly does NOT define + # BREAKPAD_NO_TERMINATE_THREAD as that define makes breakpad crash + # when created and destroyed in DllMain. + 'target_name': 'breakpad_handler_dll', + 'type': '<(library)', 'variables': { 'breakpad_handler_target': 1, }, @@ -56,7 +73,6 @@ { 'target_name': 'breakpad_handler_win64', 'type': '<(library)', - 'msvs_guid': 'C10299FB-DBDB-4FDA-B90C-1AE3FE4A9E6A', 'variables': { 'breakpad_handler_target': 1, }, @@ -67,6 +83,10 @@ 'src', ], }, + 'defines': [ + # Avoid the TerminateThread Application Verifier Failure. + 'BREAKPAD_NO_TERMINATE_THREAD', + ], 'configurations': { 'Common_Base': { 'msvs_target_platform': 'x64', |