diff options
| -rw-r--r-- | gyp/angle.gyp | 1 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 28 |
2 files changed, 24 insertions, 5 deletions
diff --git a/gyp/angle.gyp b/gyp/angle.gyp index 70ab5c2228..088895b97b 100644 --- a/gyp/angle.gyp +++ b/gyp/angle.gyp @@ -10,6 +10,7 @@ }, 'variables': { 'component': 'static_library', + 'skia_building_angle': 1, # See comment in common_conditions.gypi. }, 'includes': [ '../third_party/externals/angle/src/build_angle.gypi', diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 51865bf2d1..0e13333682 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -96,12 +96,30 @@ }, }], ['skia_arch_width == 32', { - 'msvs_configuration_platform': 'Win32', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'true', - }, + # This gypi file will be included directly into the gyp(i) files in the angle repo by + # our gyp_skia script. We don't want force WarnAsError on angle. So angle.gyp defines + # skia_building_angle=1 and here we select whether to enable WarnAsError based on that + # var's value. Here it defaults to 0. + 'variables' : { + 'skia_building_angle%': 0, }, + 'conditions' : [ + ['skia_building_angle', { + 'msvs_configuration_platform': 'Win32', + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + }, + }, + },{ # not angle + 'msvs_configuration_platform': 'Win32', + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'true', + }, + }, + }], + ], }], ], }, |