summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorochang <ochang@chromium.org>2016-04-05 14:41:25 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-05 14:41:25 -0700
commite5984e92ff378a86118f1e6428dc325dbde9c409 (patch)
tree7ec91fd7591ca611ab63ca9c6125e687bf46f2a3
parent6fb598b9dff93602134f1976443ae6d6ff015c4d (diff)
downloadpdfium-chromium/2706.tar.xz
Suppress some additional msvs warnings (GN).chromium/2706chromium/2705chromium/2703chromium/2702chromium/2701
Fixes GN build after 47ca692. R=tsepez@chromium.org,weili@chromium.org Review URL: https://codereview.chromium.org/1862773002
-rw-r--r--BUILD.gn5
-rw-r--r--third_party/BUILD.gn13
2 files changed, 17 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 806367e189..32d7886b98 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -42,7 +42,10 @@ config("pdfium_config") {
}
if (is_win) {
- cflags += [ "/wd4267" ]
+ cflags += [
+ "/wd4267",
+ "/wd4701",
+ ]
}
if (is_clang || is_posix) {
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index ec6f8cb7f8..f899bd1481 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -252,11 +252,24 @@ source_set("jpeg") {
]
}
+config("fx_libopenjpeg_warnings") {
+ visibility = [ ":*" ]
+ if (is_win) {
+ cflags = [
+ # Signed/unsigned comparisons.
+ "/wd4018",
+ ]
+ }
+}
+
source_set("fx_libopenjpeg") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
"//third_party/pdfium:pdfium_config",
+
+ # Must be after no_chromium_code for warning flags to be ordered correctly.
+ ":fx_libopenjpeg_warnings",
]
sources = [
"libopenjpeg20/bio.c",