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/libjpeg.gyp

diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
index f668310..da2b9de 100644
--- a/gyp/libjpeg.gyp
+++ b/gyp/libjpeg.gyp
@@ -11,6 +11,7 @@
 {
   'variables': {
     'use_system_libjpeg%': 0,
+    'skia_warnings_as_errors': 0,
   },
   'conditions': [
     ['skia_os == "android"', {
@@ -95,24 +96,12 @@
                 ],
               },
               'conditions': [
-                ['OS!="win"', {
+                [ 'skia_os != "win"', {
                   'product_name': 'jpeg',
                   'cflags': [
                    '-Wno-main', # supresses warnings about naming things "main"
                   ],
                 }],
-                ['OS=="android"', {
-                  'cflags!': [
-                   '-fno-rtti', # supresses warnings about invalid option of non-C++ code
-                   '-Wall',
-                   '-Werror',
-                  ],
-                }],
-                ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
-                  'cflags!': [
-                   '-Werror',
-                  ],
-                }],
               ],
             },
           ],