Update SK_IMAGE_VERSION to test RAW
Bump SK_IMAGE_VERSION to test the images in v2 in GoogleStorage, which
includes the images from v1 plus test images for SkRawCodec.
Only define skia_decodes_raw on platforms that support it, rather than
defining it always and checking additional conditions to determine
whether to support raw. Further, define it and SK_CODEC_DECODES_RAW
for all targets, so we can use the compile flag in other targets.
In DM, exclude the raw extensions if SK_CODEC_DECODES_RAW is not defined.
Blacklist raw extensions on NexusPlayer, which was running out of memory
when running them.
BUG=skia:4829
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1612113002
Review URL: https://codereview.chromium.org/1612113002
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index abbe729..17c5364 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -38,10 +38,6 @@
'variables': { # level 1
'angle_path%': '../',
- # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be controlled
- # by this variable.
- 'skia_codec_decodes_raw%': 1,
-
'variables': { # level 2
# Variables needed by conditions list within the level-2 variables dict.
@@ -62,6 +58,14 @@
}, {
'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 == "chromeos"', {
+ # FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime()].
+ 'skia_codec_decodes_raw%' : 0,
+ }, {
+ 'skia_codec_decodes_raw%' : 1,
+ }],
],
'arm_version%': 0,
'arm_neon%': 0,
@@ -72,6 +76,7 @@
# so that siblings of the level-2 'variables' dict can see them.
# (skia_os will depend on skia_android_framework.)
'skia_android_framework%': '<(skia_android_framework)',
+ 'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
'skia_arch_type%': '<(skia_arch_type)',
'arm_version%': '<(arm_version)',
'arm_neon%': '<(arm_neon)',
@@ -214,6 +219,7 @@
'skia_gpu_extra_tests_path%': '<(skia_gpu_extra_tests_path)',
'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
'skia_android_framework%': '<(skia_android_framework)',
+ 'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines)',
'skia_use_system_json%': '<(skia_use_system_json)',
'skia_android_path_rendering%': '<(skia_android_path_rendering)',