Revert "Add extra warnings to match what Android uses."
This reverts commit d234662df1ffeb1bf45b2ade16c4acfb94f89450.
This change broke the build. Will resubmit after fixing warnings.
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12311 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/common_conditions.gypi b/common_conditions.gypi
index 917298f..770269f 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -149,22 +149,6 @@
# The following section is common to linux + derivatives and android
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
{
- 'cflags': [
- '-fno-exceptions',
- '-fstrict-aliasing',
-
- '-Wall',
- '-Wextra',
- '-Winit-self',
- '-Wpointer-arith',
-
- '-Wno-unused-parameter',
- '-Wno-c++11-extensions',
- ],
- 'cflags_cc': [
- '-fno-rtti',
- '-Wnon-virtual-dtor',
- ],
'conditions': [
[ 'skia_warnings_as_errors', {
'cflags': [
@@ -245,6 +229,13 @@
'defines': [ 'NDEBUG' ],
},
},
+ 'cflags': [
+ '-Wall',
+ '-Wextra',
+ # suppressions below here were added for clang
+ '-Wno-unused-parameter',
+ '-Wno-c++11-extensions',
+ ],
'conditions' : [
[ 'skia_shared_lib', {
'cflags': [
@@ -483,8 +474,14 @@
'-llog',
],
'cflags': [
+ '-Wall',
+ '-fno-exceptions',
+ '-fstrict-aliasing',
'-fuse-ld=gold',
],
+ 'cflags_cc': [
+ '-fno-rtti',
+ ],
'conditions': [
[ 'skia_shared_lib', {
'cflags': [
diff --git a/poppler.gyp b/poppler.gyp
index 027aea3..5b53389 100644
--- a/poppler.gyp
+++ b/poppler.gyp
@@ -129,9 +129,6 @@
'cflags': [
'-w'
],
- 'cflags_cc!': [
- '-fno-rtti'
- ],
'conditions': [
['skia_os == "linux"', {
'include_dirs': [
