More common_conditions simplifications.

gyp/common_conditions.gypi

Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 917298f914fcbf810263e3685d0a99bba9c13bca..9a75fffc2ce1ae3522f8bd2826e5de04375c3082 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -3,41 +3,11 @@
 {
   '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': [
@@ -150,9 +120,10 @@
     [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
       {
         'cflags': [
+          '-g',
           '-fno-exceptions',
           '-fstrict-aliasing',
-        
+
           '-Wall',
           '-Wextra',
           '-Winit-self',
@@ -231,16 +202,14 @@
         ],
         'configurations': {
           'Coverage': {
-            'cflags': ['-g --coverage'],
+            'cflags': ['--coverage'],
             'ldflags': ['--coverage'],
           },
           'Debug': {
-            'cflags': ['-g']
           },
           'Release': {
             'cflags': [
               '-O<(skia_release_optimization_level)',
-              '-g',
             ],
             'defines': [ 'NDEBUG' ],
           },