diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 13:58:58 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 13:58:58 +0000 |
| commit | b60cdc8f4c57b461054f5b6b0995961719138237 (patch) | |
| tree | 4a9aa8d5d123dd5871a26f1ee7c8b32f3757031b /gyp | |
| parent | 692f88c7f04583dcb0aca58c1f885e022d72cefb (diff) | |
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@12311 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 29 | ||||
| -rw-r--r-- | gyp/poppler.gyp | 3 |
2 files changed, 13 insertions, 19 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 917298f914..770269f2b6 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/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/gyp/poppler.gyp b/gyp/poppler.gyp index 027aea381a..5b53389b78 100644 --- a/gyp/poppler.gyp +++ b/gyp/poppler.gyp @@ -129,9 +129,6 @@ 'cflags': [ '-w' ], - 'cflags_cc!': [ - '-fno-rtti' - ], 'conditions': [ ['skia_os == "linux"', { 'include_dirs': [ |