diff options
| -rw-r--r-- | build/common.gypi | 1 | ||||
| -rw-r--r-- | build/config/compiler/BUILD.gn | 1 | ||||
| -rw-r--r-- | cloud_print/service/BUILD.gn | 4 | ||||
| -rw-r--r-- | cloud_print/service/win/service.gyp | 8 | ||||
| -rw-r--r-- | third_party/zlib/BUILD.gn | 13 |
5 files changed, 18 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi index ddbbb92..edfb0c8 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5715,7 +5715,6 @@ '-Wno-missing-declarations', # http://crbug.com/505298 '-Wno-msvc-include', # http://crbug.com/505299 '-Wno-overloaded-virtual', # http://crbug.com/505301 - '-Wno-parentheses', # http://crbug.com/505302 '-Wno-pointer-sign', # http://crbug.com/505303 '-Wno-reorder', # http://crbug.com/505304 '-Wno-return-type-c-linkage', # http://crbug.com/505305 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 2c0b455..32b609e 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -814,7 +814,6 @@ if (is_win) { "-Wno-missing-declarations", # http://crbug.com/505298 "-Wno-msvc-include", # http://crbug.com/505299 "-Wno-overloaded-virtual", # http://crbug.com/505301 - "-Wno-parentheses", # http://crbug.com/505302 "-Wno-pointer-sign", # http://crbug.com/505303 "-Wno-reorder", # http://crbug.com/505304 "-Wno-return-type-c-linkage", # http://crbug.com/505305 diff --git a/cloud_print/service/BUILD.gn b/cloud_print/service/BUILD.gn index df6d636..7baf63b 100644 --- a/cloud_print/service/BUILD.gn +++ b/cloud_print/service/BUILD.gn @@ -39,6 +39,10 @@ source_set("cloud_print_service_lib") { "//net", "//url", ] + + if (is_clang) { + cflags = [ "-Wno-parentheses" ] + } } grit("service_resources") { diff --git a/cloud_print/service/win/service.gyp b/cloud_print/service/win/service.gyp index 1221842..a00c5d3 100644 --- a/cloud_print/service/win/service.gyp +++ b/cloud_print/service/win/service.gyp @@ -80,11 +80,15 @@ }, 'conditions': [ ['clang==1', { - # atlapp.h contains a global "using namespace WTL;". # TODO: Remove once cloud_print_service_config.cc no longer depends # on atlapp.h, http://crbug.com/5027 'VCCLCompilerTool': { - 'AdditionalOptions': ['-Wno-header-hygiene'], + 'AdditionalOptions': [ + # atlapp.h contains a global "using namespace WTL;". + '-Wno-header-hygiene', + # atlgdi.h does an intentional assignment in an if conditional. + '-Wno-parentheses', + ], }, }], ], diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn index 1cea9ac..a1317f2 100644 --- a/third_party/zlib/BUILD.gn +++ b/third_party/zlib/BUILD.gn @@ -102,17 +102,20 @@ static_library("minizip") { defines = [ "USE_FILE32API" ] } - if (is_clang) { - # zlib uses `if ((a == b))` for some reason. - cflags = [ "-Wno-parentheses-equality" ] - } - deps = [ ":zlib", ] + config("minizip_warnings") { + if (is_clang) { + # zlib uses `if ((a == b))` for some reason. + cflags = [ "-Wno-parentheses-equality" ] + } + } + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ ":minizip_warnings" ] public_configs = [ ":zlib_config" ] } |