gyp (third_party) warning changes for ccache
Also fix a broken unit test in MatrixTest.cpp.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002663002
Review-Url: https://codereview.chromium.org/2002663002
diff --git a/gyp/lua.gyp b/gyp/lua.gyp
index 9991e73..e0ad23a 100644
--- a/gyp/lua.gyp
+++ b/gyp/lua.gyp
@@ -59,6 +59,16 @@
'defines': [
"getlocaledecpoint()='.'",
],
+ 'cflags': [
+ '-Wno-parentheses-equality',
+ '-Wno-pointer-bool-conversion',
+ ],
+ 'xcode_settings': {
+ 'WARNING_CFLAGS': [
+ '-Wno-parentheses-equality',
+ '-Wno-pointer-bool-conversion',
+ ],
+ },
'conditions': [
['skia_os != "win"',
{
diff --git a/gyp/microhttpd.gyp b/gyp/microhttpd.gyp
index 378d9a0..3590cc1 100644
--- a/gyp/microhttpd.gyp
+++ b/gyp/microhttpd.gyp
@@ -31,6 +31,15 @@
'../third_party/externals/microhttpd/src/microhttpd/response.c',
'../third_party/externals/microhttpd/src/microhttpd/tsearch.c',
],
+ 'variables': {
+ 'skia_microhttpd_flags' : [
+ '-Wno-sign-compare',
+ '-Wno-unused-const-variable',
+ '-Wno-tautological-constant-out-of-range-compare',
+ ],
+ },
+ 'cflags': [ '<@(skia_microhttpd_flags)' ],
+ 'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_microhttpd_flags)' ], },
'conditions': [
# For each platform, run configure and scrape the generated MHD_config.h
# to get a list of platform specific defines
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
index 59ca61c..43cf6ab 100644
--- a/gyp/zlib.gyp
+++ b/gyp/zlib.gyp
@@ -19,7 +19,8 @@
},
}, {
'type': 'static_library',
- 'cflags': [ '-w' ],
+ 'cflags': [ '-Wno-unused-value' ],
+ 'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-unused-value', ], },
'sources': [
'../third_party/externals/zlib/adler32.c',
'../third_party/externals/zlib/compress.c',
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 1399bf2..2f91cca 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -42,7 +42,7 @@
if (0 == aVal && 0 == bVal && aValI != bValI) {
foundZeroSignDiff = true;
} else {
- REPORTER_ASSERT(reporter, aVal == bVal && aValI == aValI);
+ REPORTER_ASSERT(reporter, aVal == bVal && aValI == bValI);
}
}
REPORTER_ASSERT(reporter, foundZeroSignDiff);