diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-11-17 08:25:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-17 16:26:51 +0000 |
| commit | e3b3a04fda84341ffa297c79572b5b44b83f3649 (patch) | |
| tree | 186015509f9015c27f1164ab01d0949cf832df7c /breakpad/BUILD.gn | |
| parent | dff906eef78f37d1b44bb67785440366245ddb9d (diff) | |
| download | chromium_src-e3b3a04fda84341ffa297c79572b5b44b83f3649.zip chromium_src-e3b3a04fda84341ffa297c79572b5b44b83f3649.tar.gz chromium_src-e3b3a04fda84341ffa297c79572b5b44b83f3649.tar.bz2 | |
Fix compilation of breakpad with gn for iOS.
Correctly lift the sources_assignment_filter so that code shared with
mac is also build on iOS and add some files that were missing from the
build.
Correctly export the required include_dirs and disable the deprecation
warnings (so that we can build with -Werror).
BUG=459705
Review URL: https://codereview.chromium.org/1450893002
Cr-Commit-Position: refs/heads/master@{#360087}
Diffstat (limited to 'breakpad/BUILD.gn')
| -rw-r--r-- | breakpad/BUILD.gn | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn index 233c597..08af6c7 100644 --- a/breakpad/BUILD.gn +++ b/breakpad/BUILD.gn @@ -725,6 +725,7 @@ if (is_linux || is_android) { if (is_ios) { static_library("client") { + set_sources_assignment_filter([]) sources = [ "src/client/ios/Breakpad.h", "src/client/ios/Breakpad.mm", @@ -751,6 +752,8 @@ if (is_ios) { "src/client/minidump_file_writer.h", "src/common/convert_UTF.c", "src/common/convert_UTF.h", + "src/common/mac/GTMLogger.h", + "src/common/mac/GTMLogger.m", "src/common/mac/HTTPMultipartUpload.m", "src/common/mac/file_id.cc", "src/common/mac/file_id.h", @@ -770,12 +773,20 @@ if (is_ios) { "src/common/string_conversion.h", "src/google_breakpad/common/minidump_format.h", ] + set_sources_assignment_filter(sources_assignment_filter) include_dirs = [ "src", "src/client/mac/Framework", "src/common/mac", ] + + public_configs = [ ":client_config" ] + + if (is_clang) { + # See https://bugs.chromium.org/p/google-breakpad/issues/detail?id=675. + cflags = [ "-Wno-deprecated-declarations" ] + } } # TODO(GYP) There is some XCode-only targets like ninja-breakpad. } |