diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
| commit | 4e180b6a0b4720a9b8e9e959a882386f690f08ff (patch) | |
| tree | 788435d09362885908ba5ba9ef868b852ca82c0b /components/breakpad.gypi | |
| parent | 1179b92b08db0c652a0cf003ab4d89b31ce3610f (diff) | |
| download | chromium_org-4e180b6a0b4720a9b8e9e959a882386f690f08ff.tar.gz | |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
Diffstat (limited to 'components/breakpad.gypi')
| -rw-r--r-- | components/breakpad.gypi | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/components/breakpad.gypi b/components/breakpad.gypi index c893870926..c79d81597e 100644 --- a/components/breakpad.gypi +++ b/components/breakpad.gypi @@ -12,6 +12,8 @@ 'sources': [ 'breakpad/breakpad_client.cc', 'breakpad/breakpad_client.h', + 'breakpad/breakpad_mac.h', + 'breakpad/breakpad_mac.mm', ], }], ], @@ -26,6 +28,14 @@ 'dependencies': [ '../base/base.gyp:base', ], + 'conditions': [ + ['OS=="mac"', { + 'dependencies': [ + '../breakpad/breakpad.gyp:breakpad', + '../content/content.gyp:content_common', + ], + }], + ], }, ], 'conditions': [ @@ -51,16 +61,17 @@ ['OS=="mac"', { 'targets': [ { - # TODO(jochen): for now, this target is a copy of breakpad, however, - # in the future, it should provide a dummy implementation for Mac. 'target_name': 'breakpad_stubs', 'type': 'static_library', - 'variables': { - 'breakpad_component_target': 1, - }, 'dependencies': [ '../base/base.gyp:base', ], + 'sources': [ + 'breakpad/breakpad_client.cc', + 'breakpad/breakpad_client.h', + 'breakpad/breakpad_mac.h', + 'breakpad/breakpad_mac_stubs.mm', + ], }, ], }], |