diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-21 18:02:50 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-21 18:02:50 +0000 |
| commit | 47ae4b0d54cb3d6b12ceed9ed74a0cfc4f9fd181 (patch) | |
| tree | 11eb6821ee8a31dad940abe03618af419063cfe3 /gyp/common_variables.gypi | |
| parent | c192aa49375815fdcf702009f882d5b8c7aa86f5 (diff) | |
Add skia_clang_build gyp define, add -Wstring-conversion flag
If you want the warning, you have to specify skia_clang_build=1
R=djsollen@google.com
Review URL: https://codereview.chromium.org/23038014
git-svn-id: http://skia.googlecode.com/svn/trunk@10861 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/common_variables.gypi')
| -rw-r--r-- | gyp/common_variables.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 8965c829bd..117ec9eedb 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -78,6 +78,7 @@ }], ], + 'skia_asan_build%': 0, 'skia_scalar%': 'float', 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, @@ -117,6 +118,11 @@ }, { 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)', }], + [ 'skia_asan_build', { + 'skia_clang_build': 1, + }, { + 'skia_clang_build%': 0, + }], ], # Re-define all variables defined within the level-2 'variables' dict, @@ -126,6 +132,7 @@ 'arm_neon_optional%': 0, 'skia_os%': '<(skia_os)', 'os_posix%': '<(os_posix)', + 'skia_asan_build%': '<(skia_asan_build)', 'skia_scalar%': '<(skia_scalar)', 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', @@ -145,7 +152,6 @@ 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', - 'skia_asan_build%': 0, # These are referenced by our .gypi files that list files (e.g. core.gypi) # |