Chromium Code Reviews| Index: gyp/common_conditions.gypi |
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
| index 770269f2b6fbff9e8ed90b185a03ef3692cb08ac..bcdb0cf797c748dbc12a3049075863d00d0d5eca 100644 |
| --- a/gyp/common_conditions.gypi |
| +++ b/gyp/common_conditions.gypi |
| @@ -149,6 +149,17 @@ |
| # The following section is common to linux + derivatives and android |
| [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', |
| { |
| + 'cflags': [ |
| + '-Wall', |
| + '-Wextra', |
| + '-Winit-self', |
| + '-Wpointer-arith', |
| + # suppressions below here were added for clang / android |
| + '-Wno-unused-parameter', |
| + ], |
| + 'cflags_cc': [ |
| + '-Wnon-virtual-dtor', |
| + ], |
| 'conditions': [ |
| [ 'skia_warnings_as_errors', { |
| 'cflags': [ |
| @@ -230,10 +241,7 @@ |
| }, |
| }, |
| 'cflags': [ |
| - '-Wall', |
| - '-Wextra', |
| # suppressions below here were added for clang |
| - '-Wno-unused-parameter', |
| '-Wno-c++11-extensions', |
|
mtklein
2013/11/18 21:21:56
Move this guy up too and get rid of this block?
djsollen
2013/11/18 21:34:04
Done.
|
| ], |
| 'conditions' : [ |
| @@ -474,7 +482,6 @@ |
| '-llog', |
| ], |
| 'cflags': [ |
| - '-Wall', |
| '-fno-exceptions', |
| '-fstrict-aliasing', |
| '-fuse-ld=gold', |