diff options
| author | thakis <thakis@chromium.org> | 2015-08-18 17:28:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-19 00:29:42 +0000 |
| commit | b2105710d8eab709b51cd3c5a5d974eb544d16d5 (patch) | |
| tree | f629ca965e2392075dfcdde3a2a8b9047d1d91bb /third_party/brotli | |
| parent | ffc716a3e0900d38497c9e7ad3ebef2a210803a7 (diff) | |
| download | chromium_src-b2105710d8eab709b51cd3c5a5d974eb544d16d5.zip chromium_src-b2105710d8eab709b51cd3c5a5d974eb544d16d5.tar.gz chromium_src-b2105710d8eab709b51cd3c5a5d974eb544d16d5.tar.bz2 | |
Explicitly pass -Wno-unused-function to the targets that need it.
Currently, it's disabled globally, but that'll hopefully change soon.
No intended behavior change.
BUG=505316
Review URL: https://codereview.chromium.org/1269293003
Cr-Commit-Position: refs/heads/master@{#344097}
Diffstat (limited to 'third_party/brotli')
| -rw-r--r-- | third_party/brotli/BUILD.gn | 9 | ||||
| -rw-r--r-- | third_party/brotli/brotli.gyp | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/third_party/brotli/BUILD.gn b/third_party/brotli/BUILD.gn index 8e1c111..2975f03 100644 --- a/third_party/brotli/BUILD.gn +++ b/third_party/brotli/BUILD.gn @@ -23,8 +23,17 @@ source_set("brotli") { "dec/types.h", ] + config("brotli_warnings") { + if (is_clang) { + # IncrementalCopyFastPath in decode.c can be unused. + # (The file looks very different upstream, this is probably no longer + # needed after rolling brotli the next time.) + cflags = [ "-Wno-unused-function" ] + } + } configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ ":brotli_warnings" ] # Since we are never debug brotli, freeze the optimizations to -O2. if (is_debug) { diff --git a/third_party/brotli/brotli.gyp b/third_party/brotli/brotli.gyp index 9c47b1f..38c4729 100644 --- a/third_party/brotli/brotli.gyp +++ b/third_party/brotli/brotli.gyp @@ -29,6 +29,14 @@ 'dec/transform.h', 'dec/types.h', ], + 'variables': { + 'clang_warning_flags': [ + # IncrementalCopyFastPath in decode.c can be unused. + # (The file looks very different upstream, this is probably no longer + # needed after rolling brotli the next time.) + '-Wno-unused-function', + ], + }, 'conditions': [ ['os_posix==1 and (target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64")', { 'cflags!': ['-Os'], |