Refactor skia_warnings_as_errors

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
 #    'SK_SUPPORT_HINTING_SCALE_FACTOR',
   ],
   'conditions' : [
-    ['skia_gpu == 1',
+    [ 'skia_gpu == 1',
       {
         'defines': [
           'SK_SUPPORT_GPU=1',
         ],
       }, {
         'defines': [
           'SK_SUPPORT_GPU=0',
         ],
       },
     ],
-    ['skia_os == "win"',
+    [ 'skia_os == "win"',
       {
         'defines': [
           'SK_BUILD_FOR_WIN32',
           'SK_IGNORE_STDINT_DOT_H',
           '_CRT_SECURE_NO_WARNINGS',
           'GR_GL_FUNCTION_TYPE=__stdcall',
         ],
         'msvs_cygwin_shell': 0,
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ skipping 44 matching lines @@
                 'GenerateDebugInformation': 'true', # /DEBUG
                 'LinkTimeCodeGeneration': '1',      # useLinkTimeCodeGeneration /LTCG
               },
               'VCLibrarianTool': {
                 'LinkTimeCodeGeneration': 'true',   # useLinkTimeCodeGeneration /LTCG
               },
             },
           },
         },
         'conditions' : [
-          ['skia_arch_width == 64', {
+          [ 'skia_arch_width == 64', {
             'msvs_configuration_platform': 'x64',
+          }],
+          [ 'skia_arch_width == 32', {
+            'msvs_configuration_platform': 'Win32',
+          }],
+          [ 'skia_warnings_as_errors', {
             'msvs_settings': {
               'VCCLCompilerTool': {
-                'WarnAsError': 'false',
+                'WarnAsError': 'true',
+                'AdditionalOptions': [
+                  '/we4189', # initialized but unused var warning
+                ],
               },
             },
           }],
-          ['skia_arch_width == 32', {
-            # This gypi file will be included directly into the gyp(i) files in the angle repo by
-            # our gyp_skia script. We don't want force WarnAsError on angle. So angle.gyp defines
-            # skia_building_angle=1 and here we select whether to enable WarnAsError based on that
-            # var's value. Here it defaults to 0.
-            'variables' : {
-              'skia_building_angle%': 0,
-            },
-            'conditions' : [
-              ['skia_building_angle', {
-                'msvs_configuration_platform': 'Win32',
-                'msvs_settings': {
-                  'VCCLCompilerTool': {
-                    'WarnAsError': 'false',
-                  },
-                },
-              },{ # not angle
-                'msvs_configuration_platform': 'Win32',
-                'msvs_settings': {
-                  'VCCLCompilerTool': {
-                    'WarnAsError': 'true',
-                    'AdditionalOptions': [
-                      '/we4189', # initialized but unused var warning
-                    ],
-                  },
-                },
-              }],
-            ],
-          }],
         ],
       },
     ],
 
-    ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]',
+    [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]',
       {
         'defines': [
           'SK_SAMPLES_FOR_X',
           'SK_BUILD_FOR_UNIX',
         ],
         'configurations': {
           'Debug': {
             'cflags': ['-g']
           },
           'Release': {
             'cflags': ['-O3 -g'],
             'defines': [ 'NDEBUG' ],
           },
         },
         'cflags': [
-          '-Werror',
           '-Wall',
           '-Wextra',
           # suppressions below here were added for clang
           '-Wno-unused-parameter',
           '-Wno-c++11-extensions'
         ],
         'conditions' : [
-          ['skia_warnings_as_errors == 1', {
+          [ 'skia_warnings_as_errors', {
             'cflags': [
               '-Werror',
             ],
           }],
-          ['skia_arch_width == 64', {
+          [ 'skia_arch_width == 64', {
             'cflags': [
               '-m64',
             ],
             'ldflags': [
               '-m64',
             ],
           }],
-          ['skia_arch_width == 32', {
+          [ 'skia_arch_width == 32', {
             'cflags': [
               '-m32',
             ],
             'ldflags': [
               '-m32',
             ],
           }],
           [ 'skia_os == "nacl"', {
             'defines': [
               'SK_BUILD_FOR_NACL',
             ],
             'link_settings': {
               'libraries': [
                 '-lppapi',
                 '-lppapi_cpp',
                 '-lnosys',
                 '-pthread',
               ],
             },
           }, { # skia_os != "nacl"
             'include_dirs' : [
               '/usr/include/freetype2',
             ],
           }],
         ],
       },
     ],
 
-    ['skia_os == "mac"',
+    [ 'skia_os == "mac"',
       {
         'variables': {
           'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)',
         },
         'defines': [
           'SK_BUILD_FOR_MAC',
         ],
         'conditions' : [
-          ['skia_arch_width == 64', {
+          [ 'skia_arch_width == 64', {
             'xcode_settings': {
               'ARCHS': 'x86_64',
             },
           }],
-          ['skia_arch_width == 32', {
+          [ 'skia_arch_width == 32', {
             'xcode_settings': {
               'ARCHS': 'i386',
+            },
+          }],
+          [ 'skia_warnings_as_errors', {
+            'xcode_settings': {
               'OTHER_CPLUSPLUSFLAGS': [
                 '-Werror',
               ],
             },
           }],
         ],
         'configurations': {
           'Debug': {
             'xcode_settings': {
               'GCC_OPTIMIZATION_LEVEL': '0',
             },
           },
           'Release': {
             'xcode_settings': {
               'GCC_OPTIMIZATION_LEVEL': '3',
             },
             'defines': [ 'NDEBUG' ],
           },
         },
         'xcode_settings': {
           'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
           'conditions': [
-            ['skia_osx_sdkroot==""', {
+            [ 'skia_osx_sdkroot==""', {
               'SDKROOT': 'macosx<(mac_sdk)',  # -isysroot
             }, {
               'SDKROOT': '<(skia_osx_sdkroot)',  # -isysroot
             }],
            ],
 # trying to get this to work, but it needs clang I think...
 #          'WARNING_CFLAGS': '-Wexit-time-destructors',
           'CLANG_WARN_CXX0X_EXTENSIONS': 'NO',
           'GCC_WARN_64_TO_32_BIT_CONVERSION': 'YES',
           'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES',
@@ skipping 15 matching lines @@
           'GCC_WARN_UNUSED_VARIABLE': 'YES',
           'OTHER_CPLUSPLUSFLAGS': [
             '-mssse3',
             '-fvisibility=hidden',
             '-fvisibility-inlines-hidden',
           ],
         },
       },
     ],
 
-    ['skia_os == "ios"',
+    [ 'skia_os == "ios"',
       {
         'defines': [
           'SK_BUILD_FOR_IOS',
         ],
+        'conditions' : [
+          [ 'skia_warnings_as_errors', {
+            'xcode_settings': {
+              'OTHER_CPLUSPLUSFLAGS': [
+                '-Werror',
+              ],
+            },
+          }],
+        ],
         'configurations': {
           'Debug': {
             'xcode_settings': {
               'GCC_OPTIMIZATION_LEVEL': '0',
             },
           },
           'Release': {
             'xcode_settings': {
               'GCC_OPTIMIZATION_LEVEL': '3',
             },
             'defines': [ 'NDEBUG' ],
           },
         },
         'xcode_settings': {
           'ARCHS': 'armv6 armv7',
           'CODE_SIGNING_REQUIRED': 'NO',
           'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
           'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
           'SDKROOT': 'iphoneos',
           'TARGETED_DEVICE_FAMILY': '1,2',
-          'OTHER_CPLUSPLUSFLAGS': '-fvisibility=hidden -fvisibility-inlines-hidden',
+          'OTHER_CPLUSPLUSFLAGS': [
+            '-fvisibility=hidden',
+            '-fvisibility-inlines-hidden',
+          ],
           'GCC_THUMB_SUPPORT': 'NO',
         },
       },
     ],
 
-    ['skia_os == "android"',
+    [ 'skia_os == "android"',
       {
         'defines': [
           'SK_BUILD_FOR_ANDROID',
         ],
         'configurations': {
           'Debug': {
             'cflags': ['-g']
           },
           'Release': {
             'cflags': ['-O3'],
             'defines': [ 'NDEBUG' ],
           },
         },
         'libraries': [
           '-lstdc++',
           '-lm',
           '-llog',
         ],
         'cflags': [
           '-Wall',
           '-fno-exceptions',
           '-fno-rtti',
           '-fstrict-aliasing',
           '-fuse-ld=gold',
         ],
         'conditions': [
-          [ 'skia_warnings_as_errors == 1', {
+          [ 'skia_warnings_as_errors', {
             'cflags': [
               '-Werror',
             ],
           }],
           [ 'skia_profile_enabled == 1', {
             'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
           }],
           [ 'skia_arch_type == "arm" and arm_thumb == 1', {
             'cflags': [
               '-mthumb',
@@ skipping 46 matching lines @@
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: