summaryrefslogtreecommitdiff
path: root/chromium/third_party/leveldatabase
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-08-01 12:59:39 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-04 12:40:43 +0000
commit28b1110370900897ab652cb420c371fab8857ad4 (patch)
tree41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/third_party/leveldatabase
parent399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff)
downloadqtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions. Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/leveldatabase')
-rw-r--r--chromium/third_party/leveldatabase/BUILD.gn5
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/third_party/leveldatabase/BUILD.gn b/chromium/third_party/leveldatabase/BUILD.gn
index 0057c0eed73..04cb36d337c 100644
--- a/chromium/third_party/leveldatabase/BUILD.gn
+++ b/chromium/third_party/leveldatabase/BUILD.gn
@@ -116,6 +116,11 @@ static_library("leveldatabase") {
if (is_win) {
cflags = [ "/wd4018" ] # Signed/unsigned mismatch in comparison.
+
+ if (is_official_build) {
+ # Function recursive on all control paths, crbug.com/620018
+ cflags += [ "/wd4717" ]
+ }
}
}