More common_conditions simplifications.

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_GPU=<(skia_gpu)',
+    'SK_SUPPORT_OPENCL=<(skia_opencl)',
+    'SK_DISTANCEFIELD_FONTSC=<(skia_distancefield_fonts)',
   ],
   'conditions' : [
-    [ 'skia_gpu == 1',
-      {
-        'defines': [
-          'SK_SUPPORT_GPU=1',
-        ],
-      }, {
-        'defines': [
-          'SK_SUPPORT_GPU=0',
-        ],
-      },
-    ],
-    [ 'skia_opencl == 1',
-      {
-        'defines': [
-          'SK_SUPPORT_OPENCL=1',
-        ],
-      }, {
-        'defines': [
-          'SK_SUPPORT_OPENCL=0',
-        ],
-      },
-    ],
-    [ 'skia_distancefield_fonts == 1',
-      {
-        'defines': [
-          'SK_DISTANCEFIELD_FONTS=1',
-        ],
-      }, {
-        'defines': [
-          'SK_DISTANCEFIELD_FONTS=0',
-        ],
-      },
-    ],
     [ 'skia_os == "win"',
       {
         'defines': [
           'SK_BUILD_FOR_WIN32',
           '_CRT_SECURE_NO_WARNINGS',
           'GR_GL_FUNCTION_TYPE=__stdcall',
         ],
         'msvs_cygwin_shell': 0,
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ skipping 92 matching lines @@
             },
           }],
         ],
       },
     ],
 
     # The following section is common to linux + derivatives and android
     [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
       {
         'cflags': [
+          '-g',
           '-fno-exceptions',
           '-fstrict-aliasing',
-        
+
           '-Wall',
           '-Wextra',
           '-Winit-self',
           '-Wpointer-arith',
 
           '-Wno-unused-parameter',
           '-Wno-c++11-extensions',
         ],
         'cflags_cc': [
           '-fno-rtti',
@@ skipping 58 matching lines @@
 
 
     [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]',
       {
         'defines': [
           'SK_SAMPLES_FOR_X',
           'SK_BUILD_FOR_UNIX',
         ],
         'configurations': {
           'Coverage': {
-            'cflags': ['-g --coverage'],
+            'cflags': ['--coverage'],
             'ldflags': ['--coverage'],
           },
           'Debug': {
-            'cflags': ['-g']
           },
           'Release': {
             'cflags': [
               '-O<(skia_release_optimization_level)',
-              '-g',
             ],
             'defines': [ 'NDEBUG' ],
           },
         },
         'conditions' : [
           [ 'skia_shared_lib', {
             'cflags': [
               '-fPIC',
             ],
             'defines': [
@@ skipping 260 matching lines @@
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: