diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/third_party/libpng | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/libpng')
| -rw-r--r-- | chromium/third_party/libpng/BUILD.gn | 10 | ||||
| -rw-r--r-- | chromium/third_party/libpng/libpng.gyp | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/chromium/third_party/libpng/BUILD.gn b/chromium/third_party/libpng/BUILD.gn index 787d4fa7d00..056d91d61a9 100644 --- a/chromium/third_party/libpng/BUILD.gn +++ b/chromium/third_party/libpng/BUILD.gn @@ -61,6 +61,16 @@ source_set("libpng_sources") { public_deps = [ "//third_party/zlib", ] + + # Must be in a config because of how GN orders flags (otherwise -Wall will + # appear after this, and turn it back on). + config("clang_warnings") { + if (is_clang) { + # Upstream uses self-assignment to avoid warnings. + cflags = [ "-Wno-self-assign" ] + } + } + configs += [ ":clang_warnings" ] } if (is_win) { diff --git a/chromium/third_party/libpng/libpng.gyp b/chromium/third_party/libpng/libpng.gyp index ac8fdb41c92..48b3fa409c2 100644 --- a/chromium/third_party/libpng/libpng.gyp +++ b/chromium/third_party/libpng/libpng.gyp @@ -9,6 +9,10 @@ 'dependencies': [ '../zlib/zlib.gyp:zlib', ], + 'variables': { + # Upstream uses self-assignment to avoid warnings. + 'clang_warning_flags': [ '-Wno-self-assign' ] + }, 'defines': [ 'CHROME_PNG_WRITE_SUPPORT', 'PNG_USER_CONFIG', @@ -67,7 +71,7 @@ 'defines': [ 'PNG_USE_DLL', ], - }, + }, }], ['OS=="android"', { 'toolsets': ['target', 'host'], |