skia/trunk changes for generic sanitizer gyp flag.

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
   ],
   'conditions' : [
     [ 'skia_gpu == 1',
       {
         'defines': [
@@ skipping 259 matching lines @@
               [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
                 'cflags': [
                   '-m32',
                 ],
                 'ldflags': [
                   '-m32',
                 ],
               }],
             ],
           }],
-          [ 'skia_asan_build', {
+          # Enable asan, tsan, etc.
+          [ 'skia_sanitizer', {
             'cflags': [
-              '-fsanitize=address',
+              '-fsanitize=<(skia_sanitizer)',
               '-fno-omit-frame-pointer',
             ],
             'ldflags': [
-              '-fsanitize=address',
-            ],
-          }],
-          [ 'skia_tsan_build', {
-            'cflags': [
-              '-fsanitize=thread',
-              '-fno-omit-frame-pointer',
-            ],
-            'ldflags': [
-              '-fsanitize=thread',
+              '-fsanitize=<(skia_sanitizer)',
             ],
           }],
           [ 'skia_clang_build', {
             'cflags': [
+              # Extra warnings we like but that only Clang knows about.
               '-Wstring-conversion',
             ],
           }],
         ],
       },
     ],
 
     [ 'skia_os == "mac"',
       {
         'variables': {
@@ skipping 185 matching lines @@
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: