diff options
| -rw-r--r-- | gyp/common_conditions.gypi | 7 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index a420537a25..d2b2611205 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -221,7 +221,7 @@ '-Wextra', # suppressions below here were added for clang '-Wno-unused-parameter', - '-Wno-c++11-extensions' + '-Wno-c++11-extensions', ], 'conditions' : [ [ 'skia_shared_lib', { @@ -282,6 +282,11 @@ '-fsanitize=address', ], }], + [ 'skia_clang_build', { + 'cflags': [ + '-Wstring-conversion', + ], + }], ], }, ], 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) # |