diff options
author | thakis <thakis@chromium.org> | 2016-01-04 11:06:12 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-04 19:07:10 +0000 |
commit | be09deaee48ac4e4dc274c04da6ecddc032bd2f5 (patch) | |
tree | 304943d829608e628b3d572d6e5f01a1173253d3 /build/secondary | |
parent | ab5bf4828ec6e3f1f51667e5adff9ff606614ff7 (diff) | |
download | chromium_src-be09deaee48ac4e4dc274c04da6ecddc032bd2f5.zip chromium_src-be09deaee48ac4e4dc274c04da6ecddc032bd2f5.tar.gz chromium_src-be09deaee48ac4e4dc274c04da6ecddc032bd2f5.tar.bz2 |
Roll NSS by one revision
Picks up https://codereview.chromium.org/1558903002/ and syncs the warning
flags in NSS's BUILD.gn with the gyp file.
BUG=573779
Review URL: https://codereview.chromium.org/1553193002
Cr-Commit-Position: refs/heads/master@{#367337}
Diffstat (limited to 'build/secondary')
-rw-r--r-- | build/secondary/third_party/nss/BUILD.gn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn index 7060f07..7b32a04 100644 --- a/build/secondary/third_party/nss/BUILD.gn +++ b/build/secondary/third_party/nss/BUILD.gn @@ -1188,6 +1188,9 @@ if (is_linux) { # nss doesn"t explicitly cast between different enum types. "-Wno-conversion", + # nss passes "const char*" through "void*". + "-Wno-incompatible-pointer-types", + # nss prefers `a && b || c` over `(a && b) || c`. "-Wno-logical-op-parentheses", @@ -1196,6 +1199,9 @@ if (is_linux) { # nss has some `unsigned < 0` checks. "-Wno-tautological-compare", + + # nss-urandom-abort.patch removed the only call to rng_systemFromNoise + "-Wno-unused-function", ] } |