skia/trunk changes for generic sanitizer gyp flag.
BUG=
R=borenet@google.com
Review URL: https://codereview.chromium.org/25564003
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@11648 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/common_conditions.gypi b/common_conditions.gypi
index f8012b9..1cbdd7b 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -277,26 +277,19 @@
}],
],
}],
- [ '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',
],
}],
diff --git a/common_variables.gypi b/common_variables.gypi
index 3f7b154..9aeee62 100644
--- a/common_variables.gypi
+++ b/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,7 +118,7 @@
}, {
'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)',
}],
- [ 'skia_asan_build or skia_tsan_build', {
+ [ 'skia_sanitizer', {
'skia_clang_build': 1,
}, {
'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)',
