commit a72aef8a21c095d7502385f965ad510c775a9377
author borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 22 13:16:06 2013 +0000
committer borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 22 13:16:06 2013 +0000
tree c25a3a512a9a1c10fab91071a8730a9e7cdeb1cb
parent a3a09ab1d5e8ecc6f16b14610f9dd74be569cc29

Refactor skia_warnings_as_errors
Review URL: https://codereview.chromium.org/12963002

git-svn-id: http://skia.googlecode.com/svn/trunk@8330 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/jsoncpp.gyp

diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp
index 2549639..ab00db9 100644
--- a/gyp/jsoncpp.gyp
+++ b/gyp/jsoncpp.gyp
@@ -12,6 +12,9 @@
 # and https://code.google.com/p/skia/source/detail?r=7115
 
 {
+  'variables': {
+    'skia_warnings_as_errors': 0,
+  },
   'targets': [
     {
       'target_name': 'jsoncpp',
@@ -47,29 +50,9 @@
         ],
       },
       'conditions': [
-        [ 'skia_os == "mac"', {
-          'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS!': [
-              '-Werror',
-            ]
-          },
-        }],
-        [ 'skia_os == "win"', {
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              'WarnAsError': 'false',
-            },
-          },
-        }],
         [ 'skia_os == "android"', {
           'cflags!': [
             '-Wall',
-            '-Werror',
-          ],
-        }],
-        ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
-          'cflags!': [
-            '-Werror',
           ],
         }],
       ],