aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/gyp
diff options
context:
space:
mode:
authorGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-20 13:58:58 +0000
committerGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-20 13:58:58 +0000
commitb60cdc8f4c57b461054f5b6b0995961719138237 (patch)
tree4a9aa8d5d123dd5871a26f1ee7c8b32f3757031b /platform_tools/android/gyp
parent692f88c7f04583dcb0aca58c1f885e022d72cefb (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 'platform_tools/android/gyp')
-rw-r--r--platform_tools/android/gyp/dependencies.gypi13
1 files changed, 10 insertions, 3 deletions
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index bb0db7184b..82763bea11 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -42,7 +42,9 @@
'../third_party/externals/expat/lib',
],
'cflags': [
- '-w',
+ '-Wall',
+ '-Wmissing-prototypes',
+ '-Wstrict-prototypes',
'-fexceptions',
'-DHAVE_EXPAT_CONFIG_H',
],
@@ -64,9 +66,12 @@
'../third_party/externals/gif',
],
'cflags': [
- '-w',
+ '-Wno-format',
'-DHAVE_CONFIG_H',
],
+ 'cflags!': [
+ '-Wall',
+ ],
'direct_dependent_settings': {
'include_dirs': [
'../third_party/externals/gif',
@@ -99,9 +104,11 @@
'../third_party/externals/png',
],
'cflags': [
- '-w',
'-fvisibility=hidden',
],
+ 'cflags!': [
+ '-Wall',
+ ],
'link_settings': {
'libraries': [
'-lz',