Enable RAW codec for Windows
* Fix the exception catching
* Set preprocessor differently for MSVC
BUG=skia:4889(b/26958348)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1738913002
Committed: https://skia.googlesource.com/skia/+/474e4c3dd28b67f590851321f15d9983ef7fd031
Review URL: https://codereview.chromium.org/1738913002
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 0688f62..e26939f 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -53,19 +53,15 @@
'skia_os%': '<(skia_os)',
'vulkan_merged_into_skia': '1',
'skia_android_framework%': 0,
+ # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be
+ # controlled by skia_codec_decodes_raw.
+ 'skia_codec_decodes_raw%': 1,
'conditions' : [
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', {
'skia_arch_type%': 'x86_64',
}, {
'skia_arch_type%': 'x86',
}],
- # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be
- # controlled by skia_codec_decodes_raw.
- ['skia_os == "win"', {
- 'skia_codec_decodes_raw%' : 0,
- }, {
- 'skia_codec_decodes_raw%' : 1,
- }],
],
'arm_version%': 0,
'arm_neon%': 0,