Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Unified Diff: gyp/common_variables.gypi

Issue 1653543002: Revert of Treat bad values passed to --images as a fatal error (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/common_conditions.gypi ('k') | tools/flags/SkCommonFlags.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 17c5364afc3cec362a6e7a2441a7511dcb94d34a..abbe729da1365834c229aea65739d46ad545a6ae 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -37,6 +37,10 @@
#
'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
@@ -58,14 +62,6 @@
}, {
'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,
@@ -76,7 +72,6 @@
# 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)',
@@ -219,7 +214,6 @@
'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)',
« no previous file with comments | « gyp/common_conditions.gypi ('k') | tools/flags/SkCommonFlags.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698