From dcc29b1f2eb66984a18d54e66851965472675006 Mon Sep 17 00:00:00 2001
From: weili <weili@chromium.org>
Date: Fri, 27 May 2016 17:58:23 -0700
Subject: Match GN and GYP compilation warning flags

For GN build:
Enable chromium_code compilation config for XFA code;
Remove sign-compare suppression;
Limit the strict-overflow warning suppression only to xfa target;

For GYP build:
Remove warning suppression 4800 from GYP non third-party code;

After this, all the warning flags and levels for GN and GYP
builds should match.

BUG=pdfium:29, pdfium:475

Review-Url: https://codereview.chromium.org/2011303003
---
 BUILD.gn                  | 19 ++++++-------------
 build_gyp/standalone.gypi |  7 +++++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 580bc573d1..63ac287cef 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -44,14 +44,12 @@ config("pdfium_config") {
   if (is_win) {
     cflags += [ "/wd4267" ]
   }
+}
 
-  if (is_clang || is_posix) {
-    # TODO(thestig): Fix all instances, remove this, pdfium:29
-    cflags += [ "-Wno-sign-compare" ]
-  }
-
+config("xfa_warnings") {
+  visibility = [ ":*" ]
   if (is_posix && !is_clang) {  # When GCC.
-    cflags += [ "-Wno-strict-overflow" ]
+    cflags = [ "-Wno-strict-overflow" ]
   }
 }
 
@@ -888,11 +886,7 @@ if (pdf_enable_xfa) {
     deps = [
       ":xfa",
     ]
-    configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [
-      ":pdfium_config",
-      "//build/config/compiler:no_chromium_code",
-    ]
+    configs += [ ":pdfium_config" ]
   }
 
   static_library("xfa") {
@@ -1592,10 +1586,9 @@ if (pdf_enable_xfa) {
         "//v8:v8_libplatform",
       ]
     }
-    configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       ":pdfium_config",
-      "//build/config/compiler:no_chromium_code",
+      ":xfa_warnings",
     ]
   }
 }
diff --git a/build_gyp/standalone.gypi b/build_gyp/standalone.gypi
index f191c28e42..aa3feeaa10 100644
--- a/build_gyp/standalone.gypi
+++ b/build_gyp/standalone.gypi
@@ -205,8 +205,7 @@
       # This section is PDFium specific.
       # ####
 
-      # C4800: forcing value to bool 'true' or 'false' (performance warning)
-      4800,
+      # Now there is no PDFium specific flag. Add here if needed.
 
       # ####
       # This section should match Chromium's build/common.gypi.
@@ -479,6 +478,10 @@
             '-Wno-unused-variable',
           ],
         },
+        'msvs_disabled_warnings': [
+          # forcing value to bool 'true' or 'false' (performance warning)
+          4800,
+        ],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'WarningLevel': '3',
-- 
cgit v1.2.3