skia/trunk changes for generic sanitizer gyp flag.

gyp/common_conditions.gypi

Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index f8012b99d5344347131598e7eaaeb6918f4452e2..2ede96b202b6fbdff5cc7694c5513d36f3d3ee4f 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -277,26 +277,19 @@
               }],
             ],
           }],
-          [ 'skia_asan_build', {
+          # Enable asan, tsan, etc.
+          [ 'skia_sanitizer != ""', {

[borenet, 2013/10/01 17:49:38]

This line can also just be:

[ 'skia_sanitizer', {

[mtklein, 2013/10/01 17:53:29]

Done.

             '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',
             ],
           }],