diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 03:58:36 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 03:58:36 +0000 |
| commit | a023dca90dc6df662487330d8ae7fcdaa1265ae1 (patch) | |
| tree | 78bdf35f46b62f2873c9888cb1a11b5622dab6d7 /breakpad | |
| parent | a48af48689ea25337faca27197ba8f7c7c83128c (diff) | |
| download | chromium_src-a023dca90dc6df662487330d8ae7fcdaa1265ae1.zip chromium_src-a023dca90dc6df662487330d8ae7fcdaa1265ae1.tar.gz chromium_src-a023dca90dc6df662487330d8ae7fcdaa1265ae1.tar.bz2 | |
Get rid of ui_cocoa_third_party_toolkits target from ui.gyp
Instead we add a gyp file in third_party/google_toolbox_for_mac to build
the sources from third_party/GTM. This is the third and last patch in
this series.
BUG=299841
TEST=None
R=mark@chromium.org,ben@chromium.org
TBR=ben
Review URL: https://codereview.chromium.org/107933006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'breakpad')
| -rw-r--r-- | breakpad/breakpad.gyp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 066bf28..4c0b02a 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -707,6 +707,9 @@ { 'target_name': 'breakpad_client', 'type': 'static_library', + 'dependencies': [ + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', + ], 'sources': [ 'src/client/ios/Breakpad.h', 'src/client/ios/Breakpad.mm', @@ -756,24 +759,7 @@ 'src', 'src/client/mac/Framework', 'src/common/mac', - # For GTMLogger. - '<(DEPTH)/third_party/GTM', - '<(DEPTH)/third_party/GTM/Foundation', ], - 'link_settings': { - # Build the version of GTMLogger.m in third_party rather than the - # one in src/common/mac because the former catches all exceptions - # whereas the latter lets them propagate, which can cause odd - # crashes. - 'sources': [ - '<(DEPTH)/third_party/GTM/Foundation/GTMLogger.h', - '<(DEPTH)/third_party/GTM/Foundation/GTMLogger.m', - ], - 'include_dirs': [ - '<(DEPTH)/third_party/GTM', - '<(DEPTH)/third_party/GTM/Foundation', - ], - }, } ] }], |