skia/trunk changes for generic sanitizer gyp flag.

gyp/common_variables.gypi

Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 3f7b154b6f94781f014501e7a8984229dd4a5fa0..62bc5ef38602dadbd934357985da86811c3a4f0a 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -78,8 +78,7 @@
         }],
       ],
 
-      'skia_asan_build%': 0,
-      'skia_tsan_build%': 0,
+      'skia_sanitizer%': '',
       'skia_scalar%': 'float',
       'skia_mesa%': 0,
       'skia_nv_path_rendering%': 0,
@@ -119,8 +118,8 @@
       }, {
         'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)',
       }],
-      [ 'skia_asan_build or skia_tsan_build', {
-        'skia_clang_build': 1,
+      [ 'skia_sanitizer != ""', {

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

Again, can just use 'skia_sanitizer'

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

Done.

+        'skia_clang_build': 1,   # What's the difference between skia_clang_build and skia_clang_build%?

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

The % at the end of the variable means that we're conditionally assigning it. 
For this if/else in particular, we want to *override* skia_clang_build if we're
doing a *san build, so we avoid using the '%'.

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

Ah!  Gotcha.

       }, {
         'skia_clang_build%': 0,
       }],
@@ -133,8 +132,7 @@
     'arm_neon_optional%': 0,
     'skia_os%': '<(skia_os)',
     'os_posix%': '<(os_posix)',
-    'skia_asan_build%': '<(skia_asan_build)',
-    'skia_tsan_build%': '<(skia_tsan_build)',
+    'skia_sanitizer%': '<(skia_sanitizer)',
     'skia_scalar%': '<(skia_scalar)',
     'skia_mesa%': '<(skia_mesa)',
     'skia_nv_path_rendering%': '<(skia_nv_path_rendering)',